Fix GeyserDefineEntityPropertiesEvent#properties() NPE (#5960)

onebeastchris · web-flow · commit 73e67fc7a942 · 2025-11-02T13:52:26.000+01:00
* Fix GeyserDefineEntityPropertiesEvent#properties() NPE

* This is cleaner
diff --git a/core/src/main/java/org/geysermc/geyser/entity/properties/GeyserEntityProperties.java b/core/src/main/java/org/geysermc/geyser/entity/properties/GeyserEntityProperties.java
@@ -94,7 +94,7 @@ public <T> void add(String entityType, @NonNull PropertyType<T, ? extends Entity
     }
 
     public @NonNull List<PropertyType<?, ?>> getProperties() {
-        return properties;
+        return properties == null ? List.of() : properties;
     }
 
     public boolean isEmpty() {

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public <T> void add(String entityType, @NonNull PropertyType<T, ? extends Entity`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`public @NonNull List<PropertyType<?, ?>> getProperties() {`
`97`		`- return properties;`
	`97`	`+ return properties == null ? List.of() : properties;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public boolean isEmpty() {`