Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for 1.1_01 renames.

Browse Source 
We know these updates (can) break plugins bypassing Bukkit. They are needed for
smooth updates however. There will be another one right before before 1.1-R1.
This commit is contained in:
Erik Broes
2012-01-14 21:03:48 +01:00
parent 6495eee0c9
commit 61ec751ca1
85 changed files with 466 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/minecraft/server/EntityTrackerEntry.java
View File

@@ -100,18 +100,18 @@ public class EntityTrackerEntry {
this.i = this.tracker.motX;
this.j = this.tracker.motY;
this.k = this.tracker.motZ;
this.a((Packet) (new Packet28EntityVelocity(this.tracker.id, this.i, this.j, this.k)));
this.broadcast(new Packet28EntityVelocity(this.tracker.id, this.i, this.j, this.k));
}
}
if (object != null) {
this.a((Packet) object);
this.broadcast((Packet) object);
}
DataWatcher datawatcher = this.tracker.getDataWatcher();
if (datawatcher.a()) {
this.b((Packet) (new Packet40EntityMetadata(this.tracker.id, datawatcher)));
this.broadcastIncludingSelf(new Packet40EntityMetadata(this.tracker.id, datawatcher));
}
if (flag) {
@@ -146,14 +146,14 @@ public class EntityTrackerEntry {
}
if (!cancelled) {
this.b((Packet) (new Packet28EntityVelocity(this.tracker)));
this.broadcastIncludingSelf((Packet) (new Packet28EntityVelocity(this.tracker)));
}
// CraftBukkit end
this.tracker.velocityChanged = false;
}
}
public void a(Packet packet) {
public void broadcast(Packet packet) {
Iterator iterator = this.trackedPlayers.iterator();
while (iterator.hasNext()) {
@@ -163,15 +163,15 @@ public class EntityTrackerEntry {
}
}
public void b(Packet packet) {
this.a(packet);
public void broadcastIncludingSelf(Packet packet) {
this.broadcast(packet);
if (this.tracker instanceof EntityPlayer) {
((EntityPlayer) this.tracker).netServerHandler.sendPacket(packet);
}
}
public void a() {
this.a((Packet) (new Packet29DestroyEntity(this.tracker.id)));
this.broadcast(new Packet29DestroyEntity(this.tracker.id));
}
public void a(EntityPlayer entityplayer) {
@@ -235,7 +235,8 @@ public class EntityTrackerEntry {
private Packet b() {
if (this.tracker.dead) {
System.out.println("Fetching addPacket for removed entity: " + this.tracker.getBukkitEntity().toString()); // CraftBukkit - add some information
// CraftBukkit - add some information
System.out.println("Fetching addPacket for removed entity: " + this.tracker.getBukkitEntity().toString());
}
if (this.tracker instanceof EntityItem) {
@@ -331,15 +332,15 @@ public class EntityTrackerEntry {
if (this.tracker instanceof EntityFallingBlock) {
EntityFallingBlock entityfallingblock = (EntityFallingBlock) this.tracker;
if (entityfallingblock.a == Block.SAND.id) {
if (entityfallingblock.id == Block.SAND.id) {
return new Packet23VehicleSpawn(this.tracker, 70);
}
if (entityfallingblock.a == Block.GRAVEL.id) {
if (entityfallingblock.id == Block.GRAVEL.id) {
return new Packet23VehicleSpawn(this.tracker, 71);
}
if (entityfallingblock.a == Block.DRAGON_EGG.id) {
if (entityfallingblock.id == Block.DRAGON_EGG.id) {
return new Packet23VehicleSpawn(this.tracker, 74);
}
}