Update to 1.6.2_01 renames.

nicecube · Sep 11, 2013 · fb7d864 · fb7d864
1 parent dab007c
commit fb7d864
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/net/minecraft/server/AttributeModifier.java b/net/minecraft/server/AttributeModifier.java
@@ -21,7 +21,7 @@ public AttributeModifier(UUID uuid, String s, double d0, int i) {
         this.c = s;
         this.a = d0;
         this.b = i;
-        Validate.notEmpty((CharSequence) s, "Modifier name cannot be empty", new Object[0]);
+        Validate.notEmpty(s, "Modifier name cannot be empty", new Object[0]);
         Validate.inclusiveBetween(Integer.valueOf(0), Integer.valueOf(2), Integer.valueOf(i), "Invalid operation", new Object[0]);
     }
 

diff --git a/net/minecraft/server/ChatMessage.java b/net/minecraft/server/ChatMessage.java
@@ -28,7 +28,7 @@ public ChatMessage(ChatMessage chatmessage) {
         this.f = chatmessage.f;
         this.g = chatmessage.g;
         this.h = chatmessage.h;
-        this.i = chatmessage.i == null ? null : Lists.newArrayList((Iterable) chatmessage.i);
+        this.i = chatmessage.i == null ? null : Lists.newArrayList(chatmessage.i);
     }
 
     public ChatMessage a(EnumChatFormat enumchatformat) {
@@ -97,10 +97,10 @@ public ChatMessage a(ChatMessage chatmessage) {
             if (this.i != null) {
                 this.i.add(chatmessage);
             } else {
-                this.i = Lists.newArrayList((Object[]) (new ChatMessage[] { chatmessage}));
+                this.i = Lists.newArrayList(new ChatMessage[] { chatmessage});
             }
         } else {
-            this.i = Lists.newArrayList((Object[]) (new ChatMessage[] { new ChatMessage(this), chatmessage}));
+            this.i = Lists.newArrayList(new ChatMessage[] { new ChatMessage(this), chatmessage});
             this.g = null;
             this.h = null;
         }
@@ -116,7 +116,7 @@ public ChatMessage a(String s) {
                 this.g = s;
             }
         } else {
-            this.i = Lists.newArrayList((Object[]) (new ChatMessage[] { new ChatMessage(this), d(s)}));
+            this.i = Lists.newArrayList(new ChatMessage[] { new ChatMessage(this), d(s)});
             this.g = null;
             this.h = null;
         }
@@ -132,7 +132,7 @@ public ChatMessage b(String s) {
                 this.h = s;
             }
         } else {
-            this.i = Lists.newArrayList((Object[]) (new ChatMessage[] { new ChatMessage(this), e(s)}));
+            this.i = Lists.newArrayList(new ChatMessage[] { new ChatMessage(this), e(s)});
             this.g = null;
             this.h = null;
         }
@@ -161,7 +161,7 @@ public ChatMessage a(String s, Object... aobject) {
                 }
             }
         } else {
-            this.i = Lists.newArrayList((Object[]) (new ChatMessage[] { new ChatMessage(this), b(s, aobject)}));
+            this.i = Lists.newArrayList(new ChatMessage[] { new ChatMessage(this), b(s, aobject)});
             this.g = null;
             this.h = null;
         }

diff --git a/net/minecraft/server/RemoteControlSession.java b/net/minecraft/server/RemoteControlSession.java
@@ -38,14 +38,14 @@ public void run() {
                 BufferedInputStream bufferedinputstream = new BufferedInputStream(this.h.getInputStream());
                 int i = bufferedinputstream.read(this.i, 0, 1460);
 
-                if (10 <= i) {
-                    byte b0 = 0;
-                    int j = StatusChallengeUtils.b(this.i, 0, i);
+                if (10 > i) {
+                    return;
+                }
 
-                    if (j != i - 4) {
-                        return;
-                    }
+                byte b0 = 0;
+                int j = StatusChallengeUtils.b(this.i, 0, i);
 
+                if (j == i - 4) {
                     int k = b0 + 4;
                     int l = StatusChallengeUtils.b(this.i, k, i);
 

diff --git a/net/minecraft/server/WorldChunkManagerHell.java b/net/minecraft/server/WorldChunkManagerHell.java
@@ -29,7 +29,7 @@ public BiomeBase[] getBiomes(BiomeBase[] abiomebase, int i, int j, int k, int l)
         return abiomebase;
     }
 
-    public float[] getWetness(float[] afloat, int i, int j, int k, int l) {
+    public float[] getTemperatures(float[] afloat, int i, int j, int k, int l) {
         if (afloat == null || afloat.length < k * l) {
             afloat = new float[k * l];
         }
@@ -38,7 +38,7 @@ public float[] getWetness(float[] afloat, int i, int j, int k, int l) {
         return afloat;
     }
 
-    public float[] getTemperatures(float[] afloat, int i, int j, int k, int l) {
+    public float[] getWetness(float[] afloat, int i, int j, int k, int l) {
         if (afloat == null || afloat.length < k * l) {
             afloat = new float[k * l];
         }