summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-06 20:17:47 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-06 20:17:47 +0000
commitd04430e09b0a7067595640d16ed55299d20135ee (patch)
tree7338ee63d645913275589e263e151230b8782cf7 /nms-patches
parenta7287cb4c6f2d71fe8f22f8fd527c3c6a34aa86c (diff)
downloadcraftbukkit-d04430e09b0a7067595640d16ed55299d20135ee.tar
craftbukkit-d04430e09b0a7067595640d16ed55299d20135ee.tar.gz
craftbukkit-d04430e09b0a7067595640d16ed55299d20135ee.tar.lz
craftbukkit-d04430e09b0a7067595640d16ed55299d20135ee.tar.xz
craftbukkit-d04430e09b0a7067595640d16ed55299d20135ee.zip
SPIGOT-80: Fix players being invisible after teleporting
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityTrackerEntry.patch19
1 files changed, 16 insertions, 3 deletions
diff --git a/nms-patches/EntityTrackerEntry.patch b/nms-patches/EntityTrackerEntry.patch
index 187f133a..6703a119 100644
--- a/nms-patches/EntityTrackerEntry.patch
+++ b/nms-patches/EntityTrackerEntry.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityTrackerEntry.java 2014-11-28 17:43:43.173707433 +0000
-+++ src/main/java/net/minecraft/server/EntityTrackerEntry.java 2014-11-28 17:38:21.000000000 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/EntityTrackerEntry.java 2014-12-06 20:17:40.567361225 +0000
++++ src/main/java/net/minecraft/server/EntityTrackerEntry.java 2014-12-06 20:17:33.983361371 +0000
@@ -8,6 +8,11 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -162,7 +162,20 @@
if (this.tracker instanceof EntityLiving) {
EntityLiving entityliving = (EntityLiving) this.tracker;
-@@ -356,7 +427,10 @@
+@@ -337,8 +408,10 @@
+ }
+
+ public boolean c(EntityPlayer entityplayer) {
+- double d0 = entityplayer.locX - (double) (this.xLoc / 32);
+- double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
++ // CraftBukkit start - this.*Loc / 30 -> this.tracker.loc*
++ double d0 = entityplayer.locX - this.tracker.locX;
++ double d1 = entityplayer.locZ - this.tracker.locZ;
++ // CraftBukkit end
+
+ return d0 >= (double) (-this.b) && d0 <= (double) this.b && d1 >= (double) (-this.b) && d1 <= (double) this.b && this.tracker.a(entityplayer);
+ }
+@@ -356,7 +429,10 @@
private Packet c() {
if (this.tracker.dead) {