Fix npe for remove and rotateHead updates yaw and pitch

Tofaa2 · Aug 8, 2024 · f24fdf6 · f24fdf6
1 parent 266e4e6
commit f24fdf6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java
@@ -121,7 +121,12 @@ public void setLocation(Location location) {
     }
 
     public void remove() {
-        parent.removeEntity(this, true);
+        if (parent != null) {
+            parent.removeEntity(this, true);
+        }
+        else {
+            despawn();
+        }
     }
 
     public void despawn() {
@@ -382,6 +387,8 @@ public void rotateHead(float yaw, float pitch) {
                 new WrapperPlayServerEntityRotation(entityId, yaw, pitch, onGround),
                 new WrapperPlayServerEntityHeadLook(entityId, yaw)
         );
+        this.location.setYaw(yaw);
+        this.location.setPitch(pitch);
     }
 
     public void rotateHead(Location location) {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 import java.io.ByteArrayOutputStream
 
-val fullVersion = "2.4.5"
+val fullVersion = "2.4.7"
 val snapshot = true
 
 group = "me.tofaa.entitylib"