diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-02 17:53:34 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-02 17:53:34 +0000 |
| commit | 3c4a02ed339a4850b1cad469cf494fa187ee6b86 (patch) | |
| tree | 780b70f7eb78aec2e7c3eeb39213ff3734614036 /nms-patches/EntityHorse.patch | |
| parent | 0429c76df6a869a8602a1e20c36acc10a7199675 (diff) | |
| download | craftbukkit-3c4a02ed339a4850b1cad469cf494fa187ee6b86.tar craftbukkit-3c4a02ed339a4850b1cad469cf494fa187ee6b86.tar.gz craftbukkit-3c4a02ed339a4850b1cad469cf494fa187ee6b86.tar.lz craftbukkit-3c4a02ed339a4850b1cad469cf494fa187ee6b86.tar.xz craftbukkit-3c4a02ed339a4850b1cad469cf494fa187ee6b86.zip | |
Filter invalid bounding boxes for entities
This should prevent issues caused by broken horses
Diffstat (limited to 'nms-patches/EntityHorse.patch')
| -rw-r--r-- | nms-patches/EntityHorse.patch | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/nms-patches/EntityHorse.patch b/nms-patches/EntityHorse.patch index c5901a7a..048f5af2 100644 --- a/nms-patches/EntityHorse.patch +++ b/nms-patches/EntityHorse.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/EntityHorse.java Sun Nov 30 18:01:41 2014 -+++ src/main/java/net/minecraft/server/EntityHorse.java Sun Nov 30 18:00:23 2014 +--- ../work/decompile-8eb82bde//net/minecraft/server/EntityHorse.java 2014-12-02 17:52:23.625823043 +0000 ++++ src/main/java/net/minecraft/server/EntityHorse.java 2014-12-02 17:51:30.837824215 +0000 @@ -4,6 +4,8 @@ import java.util.Iterator; import java.util.List; @@ -61,12 +61,12 @@ } + // CraftBukkit end */ + } -+ + + // CraftBukkit start - Add method + @Override + protected void dropDeathLoot(boolean flag, int i) { + super.dropDeathLoot(flag, i); - ++ + // Moved from die method above + if (!this.world.isStatic) { + this.dropChest(); @@ -85,22 +85,7 @@ } if (!this.cw() && this.passenger == null && this.random.nextInt(300) == 0 && this.world.getType(new BlockPosition(MathHelper.floor(this.locX), MathHelper.floor(this.locY) - 1, MathHelper.floor(this.locZ))).getBlock() == Blocks.GRASS) { -@@ -730,6 +746,14 @@ - } - - public void s_() { -+ // CraftBukkit start - Remove out of bounds horses, fixes an vanilla bug -+ if ( this.locY < -600 ) { -+ world.removeEntity(this); -+ MinecraftServer.getLogger().warn("Removed oob horse. Prevented a crash for Horse @ " + this.locX + ", " + this.locY + ", " + this.locZ); -+ return; -+ } -+ // CraftBukkit end -+ - super.s_(); - if (this.world.isStatic && this.datawatcher.a()) { - this.datawatcher.e(); -@@ -949,6 +973,7 @@ +@@ -949,6 +965,7 @@ nbttagcompound.setInt("Temper", this.getTemper()); nbttagcompound.setBoolean("Tame", this.isTame()); nbttagcompound.setString("OwnerUUID", this.getOwnerUUID()); @@ -108,7 +93,7 @@ if (this.hasChest()) { NBTTagList nbttaglist = new NBTTagList(); -@@ -1001,6 +1026,12 @@ +@@ -1001,6 +1018,12 @@ this.setOwnerUUID(s); } @@ -121,7 +106,7 @@ AttributeInstance attributeinstance = this.getAttributeMap().a("Speed"); if (attributeinstance != null) { -@@ -1166,18 +1197,25 @@ +@@ -1166,18 +1189,25 @@ public void v(int i) { if (this.cE()) { |