Fix NPE from PlayerLimitation buildFilter

Ste3et · Jun 24, 2023 · 078c234 · 078c234
1 parent a9b7953
commit 078c234
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 1 deletion.
diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin
diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock
diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin
diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock
diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/...ib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/PlayerLimitation.java b/...ib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/LimitationManager/PlayerLimitation.java
@@ -57,6 +57,6 @@ public void updateConfig(Project project) {
 
 	@Override
 	public Predicate<ObjectID> buildFilter(Location location, Project project, Player player) {
-		return objectID -> objectID.getProjectOBJ().equals(project) && objectID.getUUID().equals(player.getUniqueId());
+		return objectID -> objectID.hasProjectOBJ() && objectID.getProjectOBJ().equals(project) && objectID.getUUID().equals(player.getUniqueId());
 	}
 }
diff --git a/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/main/ObjectData.java b/FurnitureLib-Core/src/main/java/de/Ste3et_C0st/FurnitureLib/main/ObjectData.java
@@ -72,6 +72,10 @@ public void setID(String s) {
     public String getProject() {
         return this.Project;
     }
+
+    public boolean hasProjectOBJ() {
+    	return Objects.nonNull(this.getProjectOBJ());
+    }
 
     public Project getProjectOBJ() {
         return FurnitureManager.getInstance().getProject(this.Project);

diff --git a/buildSrc/.gradle/7.2/executionHistory/executionHistory.lock b/buildSrc/.gradle/7.2/executionHistory/executionHistory.lock
diff --git a/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock