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

Massive renaming update in nms. If you bypassed Bukkit, you will likely break.

Browse Source 
Also minimized all the nms diffs and generic cleanups all around.
This commit is contained in:
Erik Broes
2011-06-27 00:25:01 +02:00
parent 9e5dba8306
commit a98c7ba2c7
126 changed files with 1329 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/minecraft/server/WorldMap.java
View File

@@ -9,7 +9,7 @@ public class WorldMap extends WorldMapBase {
public int b;
public int c;
public byte d;
public byte map;
public byte e;
public byte[] f = new byte[16384];
public int g;
@@ -22,7 +22,7 @@ public class WorldMap extends WorldMapBase {
}
public void a(NBTTagCompound nbttagcompound) {
this.d = nbttagcompound.c("dimension");
this.map = nbttagcompound.c("dimension");
this.b = nbttagcompound.e("xCenter");
this.c = nbttagcompound.e("zCenter");
this.e = nbttagcompound.c("scale");
@@ -63,7 +63,7 @@ public class WorldMap extends WorldMapBase {
}
public void b(NBTTagCompound nbttagcompound) {
nbttagcompound.a("dimension", this.d);
nbttagcompound.a("dimension", this.map);
nbttagcompound.a("xCenter", this.b);
nbttagcompound.a("zCenter", this.c);
nbttagcompound.a("scale", this.e);
@@ -85,9 +85,9 @@ public class WorldMap extends WorldMapBase {
for (int i = 0; i < this.h.size(); ++i) {
WorldMapHumanTracker worldmaphumantracker1 = (WorldMapHumanTracker) this.h.get(i);
if (!worldmaphumantracker1.a.dead && worldmaphumantracker1.a.inventory.c(itemstack)) {
float f = (float) (worldmaphumantracker1.a.locX - (double) this.b) / (float) (1 << this.e);
float f1 = (float) (worldmaphumantracker1.a.locZ - (double) this.c) / (float) (1 << this.e);
if (!worldmaphumantracker1.trackee.dead && worldmaphumantracker1.trackee.inventory.c(itemstack)) {
float f = (float) (worldmaphumantracker1.trackee.locX - (double) this.b) / (float) (1 << this.e);
float f1 = (float) (worldmaphumantracker1.trackee.locZ - (double) this.c) / (float) (1 << this.e);
byte b0 = 64;
byte b1 = 64;
@@ -96,20 +96,20 @@ public class WorldMap extends WorldMapBase {
byte b3 = (byte) ((int) ((double) (f * 2.0F) + 0.5D));
byte b4 = (byte) ((int) ((double) (f1 * 2.0F) + 0.5D));
// CraftBukkit
byte b5 = (byte) ((int) ((double) (worldmaphumantracker1.a.yaw * 16.0F / 360.0F) + 0.5D));
byte b5 = (byte) ((int) ((double) (worldmaphumantracker1.trackee.yaw * 16.0F / 360.0F) + 0.5D));
if (this.d < 0) {
if (this.map < 0) {
int j = this.g / 10;
b5 = (byte) (j * j * 34187121 + j * 121 >> 15 & 15);
}
if (worldmaphumantracker1.a.dimension == this.d) {
if (worldmaphumantracker1.trackee.dimension == this.map) {
this.i.add(new WorldMapOrienter(this, b2, b3, b4, b5));
}
}
} else {
this.j.remove(worldmaphumantracker1.a);
this.j.remove(worldmaphumantracker1.trackee);
this.h.remove(worldmaphumantracker1);
}
}