OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 04:02:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Correct vehicle movement issues." Fixes BUKKIT-4565

Browse source 
This reverts commit 3d906d134417cfeefe7f71b916fee4d105e7650f.

Conflicts:
	src/main/java/net/minecraft/server/EntityTrackerEntry.java
This commit is contained in:
Wesley Wolfe 2013-07-29 12:58:05 -05:00
parent b2be908fbb
commit 69d3362335
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraft/server/EntityTracker.java
View file

@ -56,9 +56,9 @@ public class EntityTracker {
} else if (entity instanceof EntityItem) { } else if (entity instanceof EntityItem) {
this.addEntity(entity, 64, 20, true); this.addEntity(entity, 64, 20, true);
} else if (entity instanceof EntityMinecartAbstract) { } 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) { } 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) { } else if (entity instanceof EntitySquid) {
this.addEntity(entity, 64, 3, true); this.addEntity(entity, 64, 3, true);
} else if (entity instanceof EntityWither) { } else if (entity instanceof EntityWither) {

10
src/main/java/net/minecraft/server/EntityTrackerEntry.java
View file

@ -69,7 +69,7 @@ public class EntityTrackerEntry {
this.scanPlayers(list); 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.v = this.tracker.vehicle;
this.broadcast(new Packet39AttachEntity(0, this.tracker, 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)); 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) { if (this.tracker instanceof EntityInsentient && ((EntityInsentient) this.tracker).bI() != null) {
entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(1, this.tracker, ((EntityInsentient) this.tracker).bI())); entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(1, this.tracker, ((EntityInsentient) this.tracker).bI()));
} }
// CraftBukkit end
if (this.tracker instanceof EntityLiving) { if (this.tracker instanceof EntityLiving) {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {