From fa175b9effe2e754cab8f72637725cc4a6597da6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 15:40:38 -0500 Subject: [PATCH] Fix drowned controller throwing StackOverflows --- patches/server/0009-Integrate-ridables.patch | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/patches/server/0009-Integrate-ridables.patch b/patches/server/0009-Integrate-ridables.patch index ed22228ed..faeb1c61c 100644 --- a/patches/server/0009-Integrate-ridables.patch +++ b/patches/server/0009-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From ef2801006bcaeab3d67c10a64461823cfce892e4 Mon Sep 17 00:00:00 2001 +From 73d1754370dbdf1b4819c96e880a047eee045610 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 19:17:21 -0500 Subject: [PATCH] Integrate ridables @@ -12,7 +12,7 @@ Subject: [PATCH] Integrate ridables .../java/net/minecraft/server/EntityCow.java | 20 +- .../net/minecraft/server/EntityCreeper.java | 14 ++ .../net/minecraft/server/EntityDolphin.java | 27 ++- - .../net/minecraft/server/EntityDrowned.java | 7 +- + .../net/minecraft/server/EntityDrowned.java | 9 +- .../minecraft/server/EntityEnderCrystal.java | 49 ++++ .../net/minecraft/server/EntityEnderman.java | 15 ++ .../net/minecraft/server/EntityEndermite.java | 17 +- @@ -53,7 +53,7 @@ Subject: [PATCH] Integrate ridables .../controller/ControllerMoveWASDFlying.java | 58 +++++ .../controller/ControllerMoveWASDWater.java | 42 ++++ .../craftbukkit/entity/CraftLivingEntity.java | 10 + - 49 files changed, 1137 insertions(+), 68 deletions(-) + 49 files changed, 1138 insertions(+), 69 deletions(-) create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java @@ -366,7 +366,7 @@ index 56394ccdc..07fe13619 100644 this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); } diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 449fbee60..482c4ee48 100644 +index 449fbee60..52571bada 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -6,7 +6,7 @@ import javax.annotation.Nullable; @@ -391,7 +391,7 @@ index 449fbee60..482c4ee48 100644 } - static class d extends ControllerMove { -+ static class d extends net.pl3x.purpur.controller.ControllerMoveWASD { ++ static class d extends net.pl3x.purpur.controller.ControllerMoveWASD { // Purpur private final EntityDrowned i; @@ -400,10 +400,19 @@ index 449fbee60..482c4ee48 100644 @Override - public void a() { -+ public void tick() { ++ public void tick() { // Purpur EntityLiving entityliving = this.i.getGoalTarget(); if (this.i.eg() && this.i.isInWater()) { +@@ -248,7 +249,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { + this.i.setMot(this.i.getMot().add(0.0D, -0.008D, 0.0D)); + } + +- super.a(); ++ super.tick(); // Purpur + } + + } diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java index 9491cb9de..871c65b88 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java