diff options
| author | md_5 <git@md-5.net> | 2016-07-10 11:44:02 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-07-10 11:44:02 +1000 |
| commit | 54902261c188b6f2715967d957b27a6ebe77b68e (patch) | |
| tree | 190241b47ac9f7259e2f26b789f1e8b00e3dfa9c /nms-patches/EntityLiving.patch | |
| parent | 02d704b55af439337a63becf23d8a1e05780ef01 (diff) | |
| download | craftbukkit-54902261c188b6f2715967d957b27a6ebe77b68e.tar craftbukkit-54902261c188b6f2715967d957b27a6ebe77b68e.tar.gz craftbukkit-54902261c188b6f2715967d957b27a6ebe77b68e.tar.lz craftbukkit-54902261c188b6f2715967d957b27a6ebe77b68e.tar.xz craftbukkit-54902261c188b6f2715967d957b27a6ebe77b68e.zip | |
SPIGOT-1994: Revert collisions to Vanilla behaviour
Diffstat (limited to 'nms-patches/EntityLiving.patch')
| -rw-r--r-- | nms-patches/EntityLiving.patch | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch index be5dbc2e..c86e5b26 100644 --- a/nms-patches/EntityLiving.patch +++ b/nms-patches/EntityLiving.patch @@ -528,21 +528,7 @@ this.setFlag(7, flag); } -@@ -1749,6 +2008,13 @@ - if (!list.isEmpty()) { - for (int i = 0; i < list.size(); ++i) { - Entity entity = (Entity) list.get(i); -+ // TODO better check now? -+ // CraftBukkit start - Only handle mob (non-player) collisions every other tick -+ if (entity instanceof EntityLiving && !(this instanceof EntityPlayer) && this.ticksLived % 2 == 0) { -+ continue; -+ } -+ // CraftBukkit end -+ - - this.C(entity); - } -@@ -1824,11 +2090,11 @@ +@@ -1824,11 +2083,11 @@ } public boolean isInteractable() { @@ -556,7 +542,7 @@ } protected void ap() { -@@ -1965,7 +2231,22 @@ +@@ -1965,7 +2224,22 @@ protected void v() { if (this.bo != null && this.cx()) { this.a(this.bo, 16); @@ -580,7 +566,7 @@ if (itemstack != null && itemstack.count == 0) { itemstack = null; -@@ -2051,10 +2332,18 @@ +@@ -2051,10 +2325,18 @@ } if (flag1) { |