Commits

Thinkofname authored d04430e09b0
SPIGOT-80: Fix players being invisible after teleporting
No tags

nms-patches/EntityTrackerEntry.patch

Modified
1 ---- ../work/decompile-8eb82bde//net/minecraft/server/EntityTrackerEntry.java 2014-11-28 17:43:43.173707433 +0000
2 -+++ src/main/java/net/minecraft/server/EntityTrackerEntry.java 2014-11-28 17:38:21.000000000 +0000
1 +--- ../work/decompile-8eb82bde//net/minecraft/server/EntityTrackerEntry.java 2014-12-06 20:17:40.567361225 +0000
2 ++++ src/main/java/net/minecraft/server/EntityTrackerEntry.java 2014-12-06 20:17:33.983361371 +0000
3 3 @@ -8,6 +8,11 @@
4 4 import org.apache.logging.log4j.LogManager;
5 5 import org.apache.logging.log4j.Logger;
6 6
7 7 +// CraftBukkit start
8 8 +import org.bukkit.entity.Player;
9 9 +import org.bukkit.event.player.PlayerVelocityEvent;
10 10 +// CraftBukkit end
11 11 +
12 12 public class EntityTrackerEntry {
155 155 }
156 156 }
157 157 +
158 158 + // CraftBukkit start - Fix for nonsensical head yaw
159 159 + this.i = MathHelper.d(this.tracker.getHeadRotation() * 256.0F / 360.0F);
160 160 + this.broadcast(new PacketPlayOutEntityHeadRotation(this.tracker, (byte) i));
161 161 + // CraftBukkit end
162 162
163 163 if (this.tracker instanceof EntityLiving) {
164 164 EntityLiving entityliving = (EntityLiving) this.tracker;
165 -@@ -356,7 +427,10 @@
165 +@@ -337,8 +408,10 @@
166 + }
167 +
168 + public boolean c(EntityPlayer entityplayer) {
169 +- double d0 = entityplayer.locX - (double) (this.xLoc / 32);
170 +- double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
171 ++ // CraftBukkit start - this.*Loc / 30 -> this.tracker.loc*
172 ++ double d0 = entityplayer.locX - this.tracker.locX;
173 ++ double d1 = entityplayer.locZ - this.tracker.locZ;
174 ++ // CraftBukkit end
175 +
176 + return d0 >= (double) (-this.b) && d0 <= (double) this.b && d1 >= (double) (-this.b) && d1 <= (double) this.b && this.tracker.a(entityplayer);
177 + }
178 +@@ -356,7 +429,10 @@
166 179
167 180 private Packet c() {
168 181 if (this.tracker.dead) {
169 182 - EntityTrackerEntry.p.warn("Fetching addPacket for removed entity");
170 183 + // CraftBukkit start - Remove useless error spam, just return
171 184 + // EntityTrackerEntry.p.warn("Fetching addPacket for removed entity");
172 185 + return null;
173 186 + // CraftBukkit end
174 187 }
175 188
176 189 if (this.tracker instanceof EntityItem) {

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut