From 69d33623353587bea885de676e33d1a0983ce7b4 Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Mon, 29 Jul 2013 12:58:05 -0500 Subject: [PATCH] Revert "Correct vehicle movement issues." Fixes BUKKIT-4565 This reverts commit 3d906d134417cfeefe7f71b916fee4d105e7650f. Conflicts: src/main/java/net/minecraft/server/EntityTrackerEntry.java --- src/main/java/net/minecraft/server/EntityTracker.java | 4 ++-- .../java/net/minecraft/server/EntityTrackerEntry.java | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java index a8e45dd0d0..1d9203b19c 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -56,9 +56,9 @@ public class EntityTracker { } else if (entity instanceof EntityItem) { this.addEntity(entity, 64, 20, true); } else if (entity instanceof EntityMinecartAbstract) { - this.addEntity(entity, 80, 2, true); // CraftBukkit - Send updates at same rate as players + this.addEntity(entity, 80, 3, true); } else if (entity instanceof EntityBoat) { - this.addEntity(entity, 80, 2, true); // CraftBukkit - Send updates at same rate as players + this.addEntity(entity, 80, 3, true); } else if (entity instanceof EntitySquid) { this.addEntity(entity, 64, 3, true); } else if (entity instanceof EntityWither) { diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index e05296c731..2a9dd2ceb2 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) {