1.8 rename fixes

5 files changed, 21 insertions, 37 deletions

diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index f490df3d..362e0d36 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -89,7 +89,7 @@ public class Chunk {
     public void a() {}
 
     public void initLighting() {
-        this.world.getClass();
+
         int i = 128 - 1;
 
         int j;
@@ -97,14 +97,11 @@ public class Chunk {
 
         for (j = 0; j < 16; ++j) {
             for (k = 0; k < 16; ++k) {
-                this.world.getClass();
+
                 int l = 128 - 1;
 
-                this.world.getClass();
                 int i1 = j << 11;
 
-                this.world.getClass();
-
                 int j1;
 
                 for (j1 = i1 | k << 7; l > 0 && Block.q[this.b[j1 + l - 1] & 255] == 0; --l) {
@@ -119,7 +116,6 @@ public class Chunk {
                 if (!this.world.worldProvider.e) {
                     int k1 = 15;
 
-                    this.world.getClass();
                     int l1 = 128 - 1;
 
                     do {
@@ -155,7 +151,6 @@ public class Chunk {
         World j0000 = this.world;
         int j0001 = this.x * 16 + 8;
 
-        this.world.getClass();
         if (j0000.areChunksLoaded(j0001, 128 / 2, this.z * 16 + 8, 16)) {
             for (int j = 0; j < 16; ++j) {
                 for (int k = 0; k < 16; ++k) {
@@ -208,7 +203,6 @@ public class Chunk {
         if (l > k) {
             World world = this.world;
 
-            this.world.getClass();
             if (world.areChunksLoaded(i, 128 / 2, j, 16)) {
                 for (int i1 = k; i1 < l; ++i1) {
                     this.world.b(EnumSkyBlock.SKY, i, i1, j);
@@ -226,12 +220,10 @@ public class Chunk {
         if (j > l) {
             i1 = j;
         }
-
+        //
         this.world.getClass();
         int j1 = i << 11;
 
-        this.world.getClass();
-
         for (int k1 = j1 | k << 7; i1 > 0 && Block.q[this.b[k1 + i1 - 1] & 255] == 0; --i1) {
             ;
         }
@@ -246,7 +238,7 @@ public class Chunk {
             if (i1 < this.k) {
                 this.k = i1;
             } else {
-                this.world.getClass();
+
                 l1 = 128 - 1;
 
                 for (i2 = 0; i2 < 16; ++i2) {
@@ -307,10 +299,8 @@ public class Chunk {
     public int getTypeId(int i, int j, int k) {
         byte[] abyte = this.b;
 
-        this.world.getClass();
         int l = i << 11;
 
-        this.world.getClass();
         return abyte[l | k << 7 | j] & 255;
     }
 
@@ -325,10 +315,8 @@ public class Chunk {
         int k1 = this.heightMap[k << 4 | i] & 255;
         byte[] j2000 = this.b;
 
-        this.world.getClass();
         int j2001 = i << 11;
 
-        this.world.getClass();
         int i2 = j2000[j2001 | k << 7 | j] & 255;
 
         if (i2 == l && this.g.a(i, j, k) == i1) {
@@ -338,9 +326,9 @@ public class Chunk {
             int k2 = this.z * 16 + k;
 
             j2000 = this.b;
-            this.world.getClass();
+
             j2001 = i << 11;
-            this.world.getClass();
+
             j2000[j2001 | k << 7 | j] = (byte) (b0 & 255);
             if (i2 != 0 && !this.world.isStatic) {
                 Block.byId[i2].remove(this.world, j2, j, k2);
@@ -403,10 +391,8 @@ public class Chunk {
         int j1 = this.heightMap[i1] & 255;
         byte[] j2000 = this.b;
 
-        this.world.getClass();
         int j2001 = i << 11;
 
-        this.world.getClass();
         int l1 = j2000[j2001 | k << 7 | j] & 255;
 
         if (l1 == l) {
@@ -416,9 +402,9 @@ public class Chunk {
             int j2 = this.z * 16 + k;
 
             j2000 = this.b;
-            this.world.getClass();
+
             j2001 = i << 11;
-            this.world.getClass();
+
             j2000[j2001 | k << 7 | j] = (byte) (b0 & 255);
             if (l1 != 0) {
                 Block.byId[l1].remove(this.world, i2, j, j2);
@@ -766,9 +752,9 @@ public class Chunk {
 
             for (k2 = i; k2 < l; ++k2) {
                 for (i3 = k; i3 < j1; ++i3) {
-                    this.world.getClass();
+
                     l2 = k2 << 11;
-                    this.world.getClass();
+
                     j3 = l2 | i3 << 7 | j;
                     k3 = i1 - j;
                     System.arraycopy(this.b, j3, abyte, k1, k3);
@@ -778,9 +764,9 @@ public class Chunk {
 
             for (k2 = i; k2 < l; ++k2) {
                 for (i3 = k; i3 < j1; ++i3) {
-                    this.world.getClass();
+
                     l2 = k2 << 11;
-                    this.world.getClass();
+
                     j3 = (l2 | i3 << 7 | j) >> 1;
                     k3 = (i1 - j) / 2;
                     System.arraycopy(this.g.a, j3, abyte, k1, k3);
@@ -790,9 +776,9 @@ public class Chunk {
 
             for (k2 = i; k2 < l; ++k2) {
                 for (i3 = k; i3 < j1; ++i3) {
-                    this.world.getClass();
+
                     l2 = k2 << 11;
-                    this.world.getClass();
+
                     j3 = (l2 | i3 << 7 | j) >> 1;
                     k3 = (i1 - j) / 2;
                     System.arraycopy(this.i.a, j3, abyte, k1, k3);
@@ -802,9 +788,9 @@ public class Chunk {
 
             for (k2 = i; k2 < l; ++k2) {
                 for (i3 = k; i3 < j1; ++i3) {
-                    this.world.getClass();
+
                     l2 = k2 << 11;
-                    this.world.getClass();
+
                     j3 = (l2 | i3 << 7 | j) >> 1;
                     k3 = (i1 - j) / 2;
                     System.arraycopy(this.h.a, j3, abyte, k1, k3);
@@ -847,7 +833,7 @@ public class Chunk {
         int l = this.c[k];
 
         if (l == -999) {
-            this.world.getClass();
+
             int i1 = 128 - 1;
 
             l = -1;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7b71ac54..3939f993 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -739,7 +739,6 @@ public abstract class Entity {
         int j = MathHelper.floor(this.locZ);
         World world = this.world;
 
-        this.world.getClass();
         if (world.isLoaded(i, 128 / 2, j)) {
             double d0 = (this.boundingBox.e - this.boundingBox.b) * 0.66D;
             int k = MathHelper.floor(this.locY - (double) this.height + d0);
diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java
index 6271393b..0e7d92a7 100644
--- a/src/main/java/net/minecraft/server/EntityPainting.java
+++ b/src/main/java/net/minecraft/server/EntityPainting.java
@@ -249,7 +249,7 @@ public class EntityPainting extends Entity {
         this.b(this.a);
     }
 
-    public void a_(double d0, double d1, double d2) {
+    public void move(double d0, double d1, double d2) {
         if (!this.world.isStatic && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) {
             this.die();
             this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index 21b56ad9..0ffc6ce4 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -26,11 +26,11 @@ public class EntitySkeleton extends EntityMonster {
         return "mob.skeletonhurt";
     }
 
-    public boolean a(DamageSource damagesource, int i) {
+    public boolean damageEntity(DamageSource damagesource, int i) {
         return super.damageEntity(damagesource, i);
     }
 
-    public void a(DamageSource damagesource) {
+    public void die(DamageSource damagesource) {
         super.die(damagesource);
         if (damagesource.e() instanceof EntityArrow && damagesource.a() instanceof EntityHuman) {
             EntityHuman entityhuman = (EntityHuman) damagesource.a();
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index d5f355bc..f55a7621 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -7,7 +7,6 @@ import java.util.logging.Logger;
 // CraftBukkit start
 import org.bukkit.ChatColor;
 import org.bukkit.craftbukkit.ChunkCompressionThread;
-import org.bukkit.craftbukkit.command.ColouredConsoleSender;
 import org.bukkit.Location;
 import org.bukkit.command.CommandException;
 import org.bukkit.craftbukkit.block.CraftBlock;
@@ -1052,7 +1051,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
 
     public void a(Packet0KeepAlive packet0keepalive) {
         if (packet0keepalive.a == this.i) {
-            int i = (int) (System.nanoTime() / 1000000L - this.x);
+            int i = (int) (System.nanoTime() / 1000000L - this.j);
 
             this.player.i = (this.player.i * 3 + i) / 4;
         }