Skip to content
This repository has been archived by the owner on Oct 17, 2020. It is now read-only.

A few fixes #143

Merged
merged 2 commits into from
Dec 7, 2013
Merged

A few fixes #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c3e5a1
Fixed Humanoid model crashing the client
123DMWM Dec 6, 2013
9551f06
Fixed colors
123DMWM Dec 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/mojang/minecraft/Minecraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/mojang/minecraft/net/NetworkPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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;
}
Expand Down