From 54902261c188b6f2715967d957b27a6ebe77b68e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 10 Jul 2016 11:44:02 +1000
Subject: [PATCH] SPIGOT-1994: Revert collisions to Vanilla behaviour
---
nms-patches/EntityLiving.patch | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index be5dbc2ed6..c86e5b26be 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) {