diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityTrackerEntry.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityTrackerEntry.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index e05296c7..2a9dd2ce 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -69,7 +69,7 @@ public class EntityTrackerEntry { this.scanPlayers(list); } - if (this.v != this.tracker.vehicle /* || this.tracker.vehicle != null && this.m % 60 == 0 */) { // CraftBukkit - Revert to 1.4 logic, this packet is a toggle + if (this.v != this.tracker.vehicle || this.tracker.vehicle != null && this.m % 60 == 0) { this.v = this.tracker.vehicle; this.broadcast(new Packet39AttachEntity(0, this.tracker, this.tracker.vehicle)); } @@ -343,17 +343,9 @@ public class EntityTrackerEntry { entityplayer.playerConnection.sendPacket(new Packet28EntityVelocity(this.tracker.id, this.tracker.motX, this.tracker.motY, this.tracker.motZ)); } - // CraftBukkit start - if (this.tracker.vehicle != null && this.tracker.id > this.tracker.vehicle.id) { - entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, this.tracker, this.tracker.vehicle)); - } else if (this.tracker.passenger != null && this.tracker.id > this.tracker.passenger.id) { - entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, this.tracker.passenger, this.tracker)); - } - if (this.tracker instanceof EntityInsentient && ((EntityInsentient) this.tracker).bI() != null) { entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(1, this.tracker, ((EntityInsentient) this.tracker).bI())); } - // CraftBukkit end if (this.tracker instanceof EntityLiving) { for (int i = 0; i < 5; ++i) { |