Merge pull request #143 from 123DMWM/master

A few fixes
andrewphorn · Dec 7, 2013 · 8290c70 · 8290c70
2 parents e7f7eb4 + 9551f06
commit 8290c70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/mojang/minecraft/Minecraft.java b/src/main/java/com/mojang/minecraft/Minecraft.java
@@ -2100,7 +2100,7 @@ private void tick() {
 										Short r = ((Short) packetParams[1]).shortValue();
 										Short g = ((Short) packetParams[2]).shortValue();
 										Short b = ((Short) packetParams[3]).shortValue();
-										int dec = 255 * 255 * r + 255 * g + b;
+										int dec = ((r&0x0ff)<<16)|((g&0x0ff)<<8)|(b&0x0ff);
 										switch (Variable) {
 										case 0: // sky
 											this.level.skyColor = dec;

diff --git a/src/main/java/com/mojang/minecraft/net/NetworkPlayer.java b/src/main/java/com/mojang/minecraft/net/NetworkPlayer.java
@@ -58,7 +58,7 @@ public NetworkPlayer(Minecraft var1, String var3, int var4, int var5, int var6,
 				|| this.name.equalsIgnoreCase("Jonty800@")) {
 			this.modelName = "sheep";
 		}
-		if (this.modelName == "humanoid") {
+		if (this.modelName.equals("humanoid")) {
 			downloadSkin();
 		} else if (isInteger(this.modelName)) {
 			GL11.glBindTexture(3553, var1.textureManager.load("/terrain.png"));
@@ -103,15 +103,15 @@ public void bindTexture(TextureManager var1) {
 			}
 
 			this.hasHair = var10001;
-			if (this.modelName == "humanoid") {
+			if (this.modelName.equals("humanoid")) {
 				this.a = var1.load(this.newTexture);
 			}
 			this.newTexture = null;
 		}
 		if (isInteger(this.modelName)) {
 			GL11.glBindTexture(3553, var1.load("/terrain.png"));
 			return;
-		} else if (this.modelName != "humanoid") {
+		} else if (!this.modelName.equals("humanoid")) {
 			GL11.glBindTexture(3553, var1.load("/mob/" + this.modelName + ".png"));
 			return;
 		}