Check for enderdragon death

CitizensDev · Mar 28, 2023 · 9b7a6e0 · 9b7a6e0
1 parent f297808
commit 9b7a6e0
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 11 deletions.
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java
@@ -156,7 +156,8 @@ protected void L() {
         public void n() {
             if (npc != null) {
                 npc.update();
-
+            }
+            if (npc != null && getHealth() > 0) {
                 if (this.c < 0) {
                     for (int i = 0; i < this.b.length; ++i) {
                         this.b[i][0] = this.yaw;

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java
@@ -157,7 +157,8 @@ protected void L() {
         public void n() {
             if (npc != null) {
                 npc.update();
-
+            }
+            if (npc != null && getHealth() > 0) {
                 if (this.c < 0) {
                     for (int i = 0; i < this.b.length; ++i) {
                         this.b[i][0] = this.yaw;

diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java
@@ -157,7 +157,8 @@ protected void L() {
         public void n() {
             if (npc != null) {
                 npc.update();
-
+            }
+            if (npc != null && getHealth() > 0) {
                 if (this.c < 0) {
                     for (int i = 0; i < this.b.length; ++i) {
                         this.b[i][0] = this.yaw;

diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java
@@ -168,7 +168,8 @@ public boolean isLeashed() {
         public void movementTick() {
             if (npc != null) {
                 npc.update();
-
+            }
+            if (npc != null && getHealth() > 0) {
                 if (this.c < 0) {
                     for (int i = 0; i < this.b.length; ++i) {
                         this.b[i][0] = this.yaw;

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java
@@ -165,7 +165,8 @@ public boolean isLeashed() {
         public void movementTick() {
             if (npc != null) {
                 npc.update();
-
+            }
+            if (npc != null && getHealth() > 0) {
                 if (this.d < 0) {
                     for (int i = 0; i < this.c.length; ++i) {
                         this.c[i][0] = this.yaw;

diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java
@@ -160,7 +160,7 @@ public void movementTick() {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-            if (npc != null && !npc.useMinecraftAI()) {
+            if (npc != null && !npc.useMinecraftAI() && getHealth() > 0) {
                 if (this.d < 0) {
                     for (int i = 0; i < this.c.length; ++i) {
                         this.c[i][0] = this.yaw;

diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java
@@ -160,7 +160,7 @@ public void movementTick() {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-            if (npc != null && !npc.useMinecraftAI()) {
+            if (npc != null && !npc.useMinecraftAI() && !dl()) {
                 if (this.d < 0) {
                     for (int i = 0; i < this.c.length; ++i) {
                         this.c[i][0] = this.yaw;

diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java
@@ -63,7 +63,7 @@ public void aiStep() {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-            if (npc != null && !npc.useMinecraftAI()) {
+            if (npc != null && !npc.useMinecraftAI() && !isDeadOrDying()) {
                 if (this.posPointer < 0) {
                     for (int i = 0; i < this.positions.length; ++i) {
                         this.positions[i][0] = this.getYRot();

diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java
@@ -65,7 +65,7 @@ public void aiStep() {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-            if (npc != null && !npc.useMinecraftAI()) {
+            if (npc != null && !npc.useMinecraftAI() && !isDeadOrDying()) {
                 if (this.posPointer < 0) {
                     for (int i = 0; i < this.positions.length; ++i) {
                         this.positions[i][0] = this.getYRot();

diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java
@@ -66,7 +66,7 @@ public void aiStep() {
                 npc.update();
 
             }
-            if (npc != null && !npc.useMinecraftAI()) {
+            if (npc != null && !npc.useMinecraftAI() && !isDeadOrDying()) {
                 if (this.posPointer < 0) {
                     for (int i = 0; i < this.positions.length; ++i) {
                         this.positions[i][0] = this.getYRot();
@@ -105,7 +105,6 @@ public void aiStep() {
                     setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z);
                     setDeltaMovement(mot);
                 }
-
             } else {
                 super.aiStep();
             }