Fixed the ECS

JanHolger · JanHolger · commit b42f420bb8a1 · 2020-08-08T15:12:42.000+02:00
diff --git a/OnsetJava-API/src/main/java/net/onfirenetwork/onsetjava/component/EntityComponentSystem.java b/OnsetJava-API/src/main/java/net/onfirenetwork/onsetjava/component/EntityComponentSystem.java
@@ -8,6 +8,7 @@
 import net.onfirenetwork.onsetjava.plugin.event.vehicle.VehicleDamageEvent;
 import net.onfirenetwork.onsetjava.plugin.event.vehicle.VehicleRespawnEvent;
 
+import java.util.List;
 import java.util.function.Consumer;
 
 public class EntityComponentSystem {
@@ -22,11 +23,15 @@ public static void init(){
     }
 
     private static void applyEvents(Player player, Consumer<PlayerComponent> consumer){
-        player.getComponents().forEach(consumer);
+        List<PlayerComponent> components = player.getComponents();
+        components.forEach(c -> c.setEntity(player));
+        components.forEach(consumer);
     }
 
     private static void applyEvents(Vehicle vehicle, Consumer<VehicleComponent> consumer){
-        vehicle.getComponents().forEach(consumer);
+        List<VehicleComponent> components = vehicle.getComponents();
+        components.forEach(c -> c.setEntity(vehicle));
+        components.forEach(consumer);
     }
 
     @EventHandler
diff --git a/OnsetJava-API/src/main/java/net/onfirenetwork/onsetjava/entity/AttributeEntity.java b/OnsetJava-API/src/main/java/net/onfirenetwork/onsetjava/entity/AttributeEntity.java
@@ -16,7 +16,12 @@ default <T> T getAttribute(String key){
         return value == null ? null : (T) value;
     }
     default <T> T getAttribute(String key, T defaultValue){
-        return (T) getAttributes().getOrDefault(key, defaultValue);
+        T value = getAttribute(key);
+        if(value == null){
+            value = defaultValue;
+            setAttribute(key, value);
+        }
+        return value;
     }
 
 }
diff --git a/OnsetJava-JNI/src/main/java/net/onfirenetwork/onsetjava/jni/AttributeSystem.java b/OnsetJava-JNI/src/main/java/net/onfirenetwork/onsetjava/jni/AttributeSystem.java
@@ -17,8 +17,9 @@ public class AttributeSystem {
     private static Map<Integer, Map<String, Object>> text3DAttributes = new HashMap<>();
 
     public static Map<String, Object> getPlayerAttributes(int id){
-        if(!playerAttributes.containsKey(id))
+        if(!playerAttributes.containsKey(id)){
             playerAttributes.put(id, new HashMap<>());
+        }
         return playerAttributes.get(id);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,12 @@ default <T> T getAttribute(String key){`
`16`	`16`	`return value == null ? null : (T) value;`
`17`	`17`	`}`
`18`	`18`	`default <T> T getAttribute(String key, T defaultValue){`
`19`		`- return (T) getAttributes().getOrDefault(key, defaultValue);`
	`19`	`+ T value = getAttribute(key);`
	`20`	`+ if(value == null){`
	`21`	`+ value = defaultValue;`
	`22`	`+ setAttribute(key, value);`
	`23`	`+ }`
	`24`	`+ return value;`
`20`	`25`	`}`
`21`	`26`
`22`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,9 @@ public class AttributeSystem {`
`17`	`17`	`private static Map<Integer, Map<String, Object>> text3DAttributes = new HashMap<>();`
`18`	`18`
`19`	`19`	`public static Map<String, Object> getPlayerAttributes(int id){`
`20`		`- if(!playerAttributes.containsKey(id))`
	`20`	`+ if(!playerAttributes.containsKey(id)){`
`21`	`21`	`playerAttributes.put(id, new HashMap<>());`
	`22`	`+ }`
`22`	`23`	`return playerAttributes.get(id);`
`23`	`24`	`}`
`24`	`25`