Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix drowned controller throwing StackOverflows

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-09 15:40:38 -05:00
parent 58db6dc333
commit fa175b9eff
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patches/server/0009-Integrate-ridables.patch
View File

@@ -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 <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500 Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -12,7 +12,7 @@ Subject: [PATCH] Integrate ridables
.../java/net/minecraft/server/EntityCow.java | 20 +- .../java/net/minecraft/server/EntityCow.java | 20 +-
.../net/minecraft/server/EntityCreeper.java | 14 ++ .../net/minecraft/server/EntityCreeper.java | 14 ++
.../net/minecraft/server/EntityDolphin.java | 27 ++- .../net/minecraft/server/EntityDolphin.java | 27 ++-
.../net/minecraft/server/EntityDrowned.java | 7 +- .../net/minecraft/server/EntityDrowned.java | 9 +-
.../minecraft/server/EntityEnderCrystal.java | 49 ++++ .../minecraft/server/EntityEnderCrystal.java | 49 ++++
.../net/minecraft/server/EntityEnderman.java | 15 ++ .../net/minecraft/server/EntityEnderman.java | 15 ++
.../net/minecraft/server/EntityEndermite.java | 17 +- .../net/minecraft/server/EntityEndermite.java | 17 +-
@@ -53,7 +53,7 @@ Subject: [PATCH] Integrate ridables
.../controller/ControllerMoveWASDFlying.java | 58 +++++ .../controller/ControllerMoveWASDFlying.java | 58 +++++
.../controller/ControllerMoveWASDWater.java | 42 ++++ .../controller/ControllerMoveWASDWater.java | 42 ++++
.../craftbukkit/entity/CraftLivingEntity.java | 10 + .../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/ControllerLookWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.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 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)); 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 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 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
+++ b/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; @@ -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 ControllerMove {
+ static class d extends net.pl3x.purpur.controller.ControllerMoveWASD { + static class d extends net.pl3x.purpur.controller.ControllerMoveWASD { // Purpur
private final EntityDrowned i; private final EntityDrowned i;
@@ -400,10 +400,19 @@ index 449fbee60..482c4ee48 100644
@Override @Override
- public void a() { - public void a() {
+ public void tick() { + public void tick() { // Purpur
EntityLiving entityliving = this.i.getGoalTarget(); EntityLiving entityliving = this.i.getGoalTarget();
if (this.i.eg() && this.i.isInWater()) { 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 diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
index 9491cb9de..871c65b88 100644 index 9491cb9de..871c65b88 100644
--- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java