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

Update CraftBukkit to Minecraft 1.4.4.

Browse Source
This commit is contained in:
Travis Watkins
2012-11-06 06:05:28 -06:00
parent a0c3b4f9d1
commit 7f7192f8fd
169 changed files with 3295 additions and 2774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ public class EntityTrackerEntry {
private boolean isMoving;
private int u = 0;
private Entity v;
private boolean w = false;
public boolean n = false;
public Set trackedPlayers = new HashSet();
@@ -78,18 +79,18 @@ public class EntityTrackerEntry {
if (i5 != null && i5.getItem() instanceof ItemWorldMap) {
WorldMap i7 = Item.MAP.getSavedMap(i5, this.tracker.world);
Iterator i8 = list.iterator();
Iterator j0 = list.iterator();
while (i8.hasNext()) {
EntityHuman j0 = (EntityHuman) i8.next();
EntityPlayer j1 = (EntityPlayer) j0;
while (j0.hasNext()) {
EntityHuman j1 = (EntityHuman) j0.next();
EntityPlayer j2 = (EntityPlayer) j1;
i7.a(j1, i5);
if (j1.netServerHandler.lowPriorityCount() <= 5) {
Packet j2 = Item.MAP.c(i5, this.tracker.world, j1);
i7.a(j2, i5);
if (j2.netServerHandler.lowPriorityCount() <= 5) {
Packet j3 = Item.MAP.c(i5, this.tracker.world, j2);
if (j2 != null) {
j1.netServerHandler.sendPacket(j2);
if (j3 != null) {
j2.netServerHandler.sendPacket(j3);
}
}
}
@@ -131,7 +132,7 @@ public class EntityTrackerEntry {
}
// CraftBukkit end
if (j1 >= -128 && j1 < 128 && k1 >= -128 && k1 < 128 && l1 >= -128 && l1 < 128 && this.u <= 400) {
if (j1 >= -128 && j1 < 128 && k1 >= -128 && k1 < 128 && l1 >= -128 && l1 < 128 && this.u <= 400 && !this.w) {
if (flag && flag1) {
object = new Packet33RelEntityMoveLook(this.tracker.id, (byte) j1, (byte) k1, (byte) l1, (byte) l, (byte) i1);
} else if (flag) {
@@ -186,6 +187,8 @@ public class EntityTrackerEntry {
this.xRot = i1;
}
// CraftBukkit end */
this.w = false;
} else {
i = MathHelper.d(this.tracker.yaw * 256.0F / 360.0F);
j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F);
@@ -200,6 +203,13 @@ public class EntityTrackerEntry {
this.xLoc = this.tracker.ar.a(this.tracker.locX);
this.yLoc = MathHelper.floor(this.tracker.locY * 32.0D);
this.zLoc = this.tracker.ar.a(this.tracker.locZ);
DataWatcher datawatcher2 = this.tracker.getDataWatcher();
if (datawatcher2.a()) {
this.broadcastIncludingSelf(new Packet40EntityMetadata(this.tracker.id, datawatcher2, false));
}
this.w = true;
}
i = MathHelper.d(this.tracker.ap() * 256.0F / 360.0F);
@@ -355,12 +365,8 @@ public class EntityTrackerEntry {
}
public void scanPlayers(List list) {
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
EntityHuman entityhuman = (EntityHuman) iterator.next();
this.updatePlayer((EntityPlayer) entityhuman);
for (int i = 0; i < list.size(); ++i) {
this.updatePlayer((EntityPlayer) list.get(i));
}
}