summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityHanging.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
committermd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
commitc5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch)
tree9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/EntityHanging.patch
parent4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff)
downloadcraftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/EntityHanging.patch')
-rw-r--r--nms-patches/EntityHanging.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/nms-patches/EntityHanging.patch b/nms-patches/EntityHanging.patch
index 086d3fa9..88050c95 100644
--- a/nms-patches/EntityHanging.patch
+++ b/nms-patches/EntityHanging.patch
@@ -1,7 +1,7 @@
--- a/net/minecraft/server/EntityHanging.java
+++ b/net/minecraft/server/EntityHanging.java
-@@ -3,6 +3,11 @@
- import com.google.common.base.Predicate;
+@@ -4,6 +4,11 @@
+ import javax.annotation.Nullable;
import org.apache.commons.lang3.Validate;
+// CraftBukkit start
@@ -12,7 +12,7 @@
public abstract class EntityHanging extends Entity {
private static final Predicate<Entity> c = new Predicate() {
-@@ -38,30 +43,39 @@
+@@ -40,30 +45,39 @@
this.updateBoundingBox();
}
@@ -69,7 +69,7 @@
d8 = 1.0D;
} else {
d6 = 1.0D;
-@@ -70,11 +84,18 @@
+@@ -72,11 +86,18 @@
d6 /= 32.0D;
d7 /= 32.0D;
d8 /= 32.0D;
@@ -90,7 +90,7 @@
return i % 32 == 0 ? 0.5D : 0.0D;
}
-@@ -85,6 +106,24 @@
+@@ -87,6 +108,24 @@
if (this.d++ == 100 && !this.world.isClientSide) {
this.d = 0;
if (!this.dead && !this.survives()) {
@@ -115,7 +115,7 @@
this.die();
this.a((Entity) null);
}
-@@ -135,6 +174,21 @@
+@@ -137,6 +176,21 @@
return false;
} else {
if (!this.dead && !this.world.isClientSide) {
@@ -137,7 +137,7 @@
this.die();
this.ao();
this.a(damagesource.getEntity());
-@@ -146,6 +200,18 @@
+@@ -148,6 +202,18 @@
public void move(double d0, double d1, double d2) {
if (!this.world.isClientSide && !this.dead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) {
@@ -156,7 +156,7 @@
this.die();
this.a((Entity) null);
}
-@@ -153,7 +219,7 @@
+@@ -155,7 +221,7 @@
}
public void g(double d0, double d1, double d2) {