Skip to content

Instantly share code, notes, and snippets.

@Pokechu22

Pokechu22/Beta 1.6-pre3 to beta 1.6.patch

Created July 27, 2016 23:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Pokechu22/5a776ddad73be21c6bfaf451e263fef2 to your computer and use it in GitHub Desktop.
Save Pokechu22/5a776ddad73be21c6bfaf451e263fef2 to your computer and use it in GitHub Desktop.
Download ZIP
Diff from beta1.6 prerelease 3 to beta 1.6
Raw
Beta 1.6-pre3 to beta 1.6.patch
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/client/Minecraft.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/client/Minecraft.java
index cc25dbd..80899f6 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/client/Minecraft.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/client/Minecraft.java
@@ -108,7 +108,7 @@ public abstract class Minecraft
{
Display.setDisplayMode(new DisplayMode(displayWidth, displayHeight));
}
- Display.setTitle("Minecraft Minecraft Beta 1.6 Test Build 3");
+ Display.setTitle("Minecraft Minecraft Beta 1.6");
try
{
Display.create();
@@ -814,7 +814,6 @@ public abstract class Minecraft
int k = objectMouseOver.blockY;
int l = objectMouseOver.blockZ;
int i1 = objectMouseOver.sideHit;
- Block block = Block.blocksList[theWorld.getBlockId(j, k, l)];
if(i == 0)
{
playerController.clickBlock(j, k, l, objectMouseOver.sideHit);
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/BlockPortal.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/BlockPortal.java
index 5484700..1fa63a3 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/BlockPortal.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/BlockPortal.java
@@ -188,7 +188,10 @@ public class BlockPortal extends BlockBreakable
public void onEntityCollidedWithBlock(World world, int i, int j, int k, Entity entity)
{
- entity.setInPortal();
+ if(entity.ridingEntity == null && entity.riddenByEntity == null)
+ {
+ entity.setInPortal();
+ }
}
public void randomDisplayTick(World world, int i, int j, int k, Random random)
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/BlockTrapDoor.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/BlockTrapDoor.java
index 0488b2f..9b52395 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/BlockTrapDoor.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/BlockTrapDoor.java
@@ -107,6 +107,21 @@ public class BlockTrapDoor extends Block
}
}
+ public void func_28042_a(World world, int i, int j, int k, boolean flag)
+ {
+ int l = world.getBlockMetadata(i, j, k);
+ boolean flag1 = (l & 4) > 0;
+ if(flag1 == flag)
+ {
+ return;
+ } else
+ {
+ world.setBlockMetadataWithNotify(i, j, k, l ^ 4);
+ world.func_28107_a(null, 1003, i, j, k, 0);
+ return;
+ }
+ }
+
public void onNeighborBlockChange(World world, int i, int j, int k, int l)
{
if(world.multiplayerWorld)
@@ -137,6 +152,11 @@ public class BlockTrapDoor extends Block
world.setBlockWithNotify(i, j, k, 0);
dropBlockAsItem(world, i, j, k, i1);
}
+ if(l > 0 && Block.blocksList[l].canProvidePower())
+ {
+ boolean flag = world.isBlockIndirectlyGettingPowered(i, j, k);
+ func_28042_a(world, i, j, k, flag);
+ }
}
public MovingObjectPosition collisionRayTrace(World world, int i, int j, int k, Vec3D vec3d, Vec3D vec3d1)
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/EntityClientPlayerMP.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/EntityClientPlayerMP.java
index dd45704..1e4c017 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/EntityClientPlayerMP.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/EntityClientPlayerMP.java
@@ -62,10 +62,10 @@ public class EntityClientPlayerMP extends EntityPlayerSP
{
if(flag)
{
- sendQueue.func_28117_a(new Packet19EntityAction(this, 1));
+ sendQueue.addToSendQueue(new Packet19EntityAction(this, 1));
} else
{
- sendQueue.func_28117_a(new Packet19EntityAction(this, 2));
+ sendQueue.addToSendQueue(new Packet19EntityAction(this, 2));
}
field_9381_bG = flag;
}
@@ -81,30 +81,30 @@ public class EntityClientPlayerMP extends EntityPlayerSP
{
if(flag2)
{
- sendQueue.func_28117_a(new Packet11PlayerPosition(motionX, -999D, -999D, motionZ, onGround));
+ sendQueue.addToSendQueue(new Packet11PlayerPosition(motionX, -999D, -999D, motionZ, onGround));
} else
{
- sendQueue.func_28117_a(new Packet13PlayerLookMove(motionX, -999D, -999D, motionZ, rotationYaw, rotationPitch, onGround));
+ sendQueue.addToSendQueue(new Packet13PlayerLookMove(motionX, -999D, -999D, motionZ, rotationYaw, rotationPitch, onGround));
}
flag1 = false;
} else
if(flag1 && flag2)
{
- sendQueue.func_28117_a(new Packet13PlayerLookMove(posX, boundingBox.minY, posY, posZ, rotationYaw, rotationPitch, onGround));
+ sendQueue.addToSendQueue(new Packet13PlayerLookMove(posX, boundingBox.minY, posY, posZ, rotationYaw, rotationPitch, onGround));
field_12242_bI = 0;
} else
if(flag1)
{
- sendQueue.func_28117_a(new Packet11PlayerPosition(posX, boundingBox.minY, posY, posZ, onGround));
+ sendQueue.addToSendQueue(new Packet11PlayerPosition(posX, boundingBox.minY, posY, posZ, onGround));
field_12242_bI = 0;
} else
if(flag2)
{
- sendQueue.func_28117_a(new Packet12PlayerLook(rotationYaw, rotationPitch, onGround));
+ sendQueue.addToSendQueue(new Packet12PlayerLook(rotationYaw, rotationPitch, onGround));
field_12242_bI = 0;
} else
{
- sendQueue.func_28117_a(new Packet10Flying(onGround));
+ sendQueue.addToSendQueue(new Packet10Flying(onGround));
if(field_9382_bF != onGround || field_12242_bI > 200)
{
field_12242_bI = 0;
@@ -130,7 +130,7 @@ public class EntityClientPlayerMP extends EntityPlayerSP
public void dropCurrentItem()
{
- sendQueue.func_28117_a(new Packet14BlockDig(4, 0, 0, 0, 0));
+ sendQueue.addToSendQueue(new Packet14BlockDig(4, 0, 0, 0, 0));
}
private void sendInventoryChanged()
@@ -143,19 +143,19 @@ public class EntityClientPlayerMP extends EntityPlayerSP
public void sendChatMessage(String s)
{
- sendQueue.func_28117_a(new Packet3Chat(s));
+ sendQueue.addToSendQueue(new Packet3Chat(s));
}
public void swingItem()
{
super.swingItem();
- sendQueue.func_28117_a(new Packet18Animation(this, 1));
+ sendQueue.addToSendQueue(new Packet18Animation(this, 1));
}
public void respawnPlayer()
{
sendInventoryChanged();
- sendQueue.func_28117_a(new Packet9Respawn((byte)dimension));
+ sendQueue.addToSendQueue(new Packet9Respawn((byte)dimension));
}
protected void damageEntity(int i)
@@ -165,7 +165,7 @@ public class EntityClientPlayerMP extends EntityPlayerSP
public void func_20059_m()
{
- sendQueue.func_28117_a(new Packet101CloseWindow(craftingInventory.windowId));
+ sendQueue.addToSendQueue(new Packet101CloseWindow(craftingInventory.windowId));
inventory.setItemStack(null);
super.func_20059_m();
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/EntityItem.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/EntityItem.java
index ee9c799..95f1da5 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/EntityItem.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/EntityItem.java
@@ -150,7 +150,10 @@ public class EntityItem extends Entity
}
worldObj.playSoundAtEntity(this, "random.pop", 0.2F, ((rand.nextFloat() - rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
entityplayer.onItemPickup(this, i);
- setEntityDead();
+ if(item.stackSize == 0)
+ {
+ setEntityDead();
+ }
}
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/EntityPlayerSP.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/EntityPlayerSP.java
index bafdce0..afef08b 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/EntityPlayerSP.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/EntityPlayerSP.java
@@ -59,16 +59,13 @@ public class EntityPlayerSP extends EntityPlayer
field_28025_B = field_28026_A;
if(field_28023_z)
{
- if(!worldObj.multiplayerWorld)
+ if(!worldObj.multiplayerWorld && ridingEntity != null)
{
- if(ridingEntity != null)
- {
- mountEntity(null);
- }
- if(mc.currentScreen != null)
- {
- mc.displayGuiScreen(null);
- }
+ mountEntity(null);
+ }
+ if(mc.currentScreen != null)
+ {
+ mc.displayGuiScreen(null);
}
if(field_28026_A == 0.0F)
{
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiAchievement.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiAchievement.java
index 23c5ad2..a47af40 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiAchievement.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiAchievement.java
@@ -67,7 +67,7 @@ public class GuiAchievement extends Gui
GL11.glDepthMask(false);
RenderHelper.disableStandardItemLighting();
updateAchievementWindowScale();
- String s = "Minecraft Beta 1.6 Test Build 3 Unlicensed Copy :(";
+ String s = "Minecraft Beta 1.6 Unlicensed Copy :(";
String s1 = "(Or logged in from another location)";
String s2 = "Purchase at minecraft.net";
theGame.fontRenderer.drawStringWithShadow(s, 2, 2, 0xffffff);
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiDownloadTerrain.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiDownloadTerrain.java
index 44e5e62..5041717 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiDownloadTerrain.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiDownloadTerrain.java
@@ -33,7 +33,7 @@ public class GuiDownloadTerrain extends GuiScreen
updateCounter++;
if(updateCounter % 20 == 0)
{
- netHandler.func_28117_a(new Packet0KeepAlive());
+ netHandler.addToSendQueue(new Packet0KeepAlive());
}
if(netHandler != null)
{
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiEditSign.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiEditSign.java
index 6e2d636..cb2b50e 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiEditSign.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiEditSign.java
@@ -36,7 +36,7 @@ public class GuiEditSign extends GuiScreen
Keyboard.enableRepeatEvents(false);
if(mc.theWorld.multiplayerWorld)
{
- mc.func_20001_q().func_28117_a(new Packet130UpdateSign(entitySign.xCoord, entitySign.yCoord, entitySign.zCoord, entitySign.signText));
+ mc.func_20001_q().addToSendQueue(new Packet130UpdateSign(entitySign.xCoord, entitySign.yCoord, entitySign.zCoord, entitySign.signText));
}
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiIngame.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiIngame.java
index c47ed59..00660de 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiIngame.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiIngame.java
@@ -5,7 +5,6 @@
package net.minecraft.src;
import java.awt.Color;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Random;
import net.minecraft.client.Minecraft;
@@ -30,7 +29,6 @@ public class GuiIngame extends Gui
recordPlaying = "";
recordPlayingUpFor = 0;
field_22065_l = false;
- m = new DecimalFormat("##.00");
prevVignetteBrightness = 1.0F;
mc = minecraft;
}
@@ -179,7 +177,7 @@ public class GuiIngame extends Gui
}
if(mc.gameSettings.showDebugInfo)
{
- fontrenderer.drawStringWithShadow((new StringBuilder()).append("Minecraft Beta 1.6 Test Build 3 (").append(mc.debug).append(")").toString(), 2, 2, 0xffffff);
+ fontrenderer.drawStringWithShadow((new StringBuilder()).append("Minecraft Beta 1.6 (").append(mc.debug).append(")").toString(), 2, 2, 0xffffff);
fontrenderer.drawStringWithShadow(mc.func_6241_m(), 2, 12, 0xffffff);
fontrenderer.drawStringWithShadow(mc.func_6262_n(), 2, 22, 0xffffff);
fontrenderer.drawStringWithShadow(mc.func_6245_o(), 2, 32, 0xffffff);
@@ -197,7 +195,7 @@ public class GuiIngame extends Gui
drawString(fontrenderer, (new StringBuilder()).append("z: ").append(mc.thePlayer.posZ).toString(), 2, 80, 0xe0e0e0);
} else
{
- fontrenderer.drawStringWithShadow("Minecraft Beta 1.6 Test Build 3", 2, 2, 0xffffff);
+ fontrenderer.drawStringWithShadow("Minecraft Beta 1.6", 2, 2, 0xffffff);
}
if(recordPlayingUpFor > 0)
{
@@ -436,7 +434,6 @@ public class GuiIngame extends Gui
private int recordPlayingUpFor;
private boolean field_22065_l;
public float damageGuiPartialTime;
- private DecimalFormat m;
float prevVignetteBrightness;
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiMainMenu.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiMainMenu.java
index 3c8e71f..42149f6 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiMainMenu.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiMainMenu.java
@@ -138,7 +138,7 @@ public class GuiMainMenu extends GuiScreen
GL11.glScalef(f1, f1, f1);
drawCenteredString(fontRenderer, splashText, 0, -8, 0xffff00);
GL11.glPopMatrix();
- drawString(fontRenderer, "Minecraft Beta 1.6 Test Build 3", 2, 2, 0x505050);
+ drawString(fontRenderer, "Minecraft Beta 1.6", 2, 2, 0x505050);
String s = "Copyright Mojang AB. Do not distribute.";
drawString(fontRenderer, s, width - fontRenderer.getStringWidth(s) - 2, height - 10, 0xffffff);
super.drawScreen(i, j, f);
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiSleepMP.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiSleepMP.java
index 1326a16..a65eaa4 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiSleepMP.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiSleepMP.java
@@ -72,7 +72,7 @@ public class GuiSleepMP extends GuiChat
if(mc.thePlayer instanceof EntityClientPlayerMP)
{
NetClientHandler netclienthandler = ((EntityClientPlayerMP)mc.thePlayer).sendQueue;
- netclienthandler.func_28117_a(new Packet19EntityAction(mc.thePlayer, 3));
+ netclienthandler.addToSendQueue(new Packet19EntityAction(mc.thePlayer, 3));
}
}
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiVideoSettings.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiVideoSettings.java
index c15519e..7f8abe2 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/GuiVideoSettings.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/GuiVideoSettings.java
@@ -81,7 +81,7 @@ public class GuiVideoSettings extends GuiScreen
static
{
field_22108_k = (new EnumOptions[] {
- EnumOptions.GRAPHICS, EnumOptions.RENDER_DISTANCE, EnumOptions.LIMIT_FRAMERATE, EnumOptions.ANAGLYPH, EnumOptions.VIEW_BOBBING, EnumOptions.AMBIENT_OCCLUSION, EnumOptions.GUI_SCALE, EnumOptions.ADVANCED_OPENGL
+ EnumOptions.GRAPHICS, EnumOptions.RENDER_DISTANCE, EnumOptions.LIMIT_FRAMERATE, EnumOptions.ANAGLYPH, EnumOptions.VIEW_BOBBING, EnumOptions.AMBIENT_OCCLUSION, EnumOptions.GUI_SCALE
});
}
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/InventoryPlayer.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/InventoryPlayer.java
index 3a1da07..550a4a6 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/InventoryPlayer.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/InventoryPlayer.java
@@ -168,17 +168,19 @@ public class InventoryPlayer
{
if(!itemstack.isItemDamaged())
{
- itemstack.stackSize = storePartialItemStack(itemstack);
- if(itemstack.stackSize == 0)
+ int i;
+ do
{
- return true;
- }
+ i = itemstack.stackSize;
+ itemstack.stackSize = storePartialItemStack(itemstack);
+ } while(itemstack.stackSize > 0 && itemstack.stackSize < i);
+ return true;
}
- int i = getFirstEmptyStack();
- if(i >= 0)
+ int j = getFirstEmptyStack();
+ if(j >= 0)
{
- mainInventory[i] = itemstack;
- mainInventory[i].animationsToGo = 5;
+ mainInventory[j] = itemstack;
+ mainInventory[j].animationsToGo = 5;
return true;
} else
{
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/NetClientHandler.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/NetClientHandler.java
index 4767e7b..4b6f969 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/NetClientHandler.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/NetClientHandler.java
@@ -390,6 +390,19 @@ public class NetClientHandler extends NetHandler
} else
{
netManager.addToSendQueue(packet);
+ netManager.func_28142_c();
+ return;
+ }
+ }
+
+ public void addToSendQueue(Packet packet)
+ {
+ if(disconnected)
+ {
+ return;
+ } else
+ {
+ netManager.addToSendQueue(packet);
return;
}
}
@@ -461,7 +474,7 @@ public class NetClientHandler extends NetHandler
{
if(packet2handshake.username.equals("-"))
{
- func_28117_a(new Packet1Login(mc.session.username, 12));
+ addToSendQueue(new Packet1Login(mc.session.username, 13));
} else
{
try
@@ -472,7 +485,7 @@ public class NetClientHandler extends NetHandler
bufferedreader.close();
if(s.equalsIgnoreCase("ok"))
{
- func_28117_a(new Packet1Login(mc.session.username, 12));
+ addToSendQueue(new Packet1Login(mc.session.username, 13));
} else
{
netManager.networkShutdown("disconnect.loginFailedInfo", new Object[] {
@@ -493,6 +506,7 @@ public class NetClientHandler extends NetHandler
public void disconnect()
{
disconnected = true;
+ netManager.func_28139_a();
netManager.networkShutdown("disconnect.closed", new Object[0]);
}
@@ -661,7 +675,7 @@ public class NetClientHandler extends NetHandler
} else
{
container.func_20110_b(packet106transaction.field_20028_b);
- func_28117_a(new Packet106Transaction(packet106transaction.windowId, packet106transaction.field_20028_b, true));
+ addToSendQueue(new Packet106Transaction(packet106transaction.windowId, packet106transaction.field_20028_b, true));
}
}
}
@@ -698,7 +712,7 @@ public class NetClientHandler extends NetHandler
public void func_20090_a(Packet105UpdateProgressbar packet105updateprogressbar)
{
- b(packet105updateprogressbar);
+ registerPacket(packet105updateprogressbar);
if(mc.thePlayer.craftingInventory != null && mc.thePlayer.craftingInventory.windowId == packet105updateprogressbar.windowId)
{
mc.thePlayer.craftingInventory.func_20112_a(packet105updateprogressbar.progressBar, packet105updateprogressbar.progressBarValue);
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/NetHandler.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/NetHandler.java
index b2e2662..ba6f723 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/NetHandler.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/NetHandler.java
@@ -33,7 +33,7 @@ public abstract class NetHandler
{
}
- public void b(Packet packet)
+ public void registerPacket(Packet packet)
{
}
@@ -43,246 +43,246 @@ public abstract class NetHandler
public void handleKickDisconnect(Packet255KickDisconnect packet255kickdisconnect)
{
- b(packet255kickdisconnect);
+ registerPacket(packet255kickdisconnect);
}
public void handleLogin(Packet1Login packet1login)
{
- b(packet1login);
+ registerPacket(packet1login);
}
public void handleFlying(Packet10Flying packet10flying)
{
- b(packet10flying);
+ registerPacket(packet10flying);
}
public void handleMultiBlockChange(Packet52MultiBlockChange packet52multiblockchange)
{
- b(packet52multiblockchange);
+ registerPacket(packet52multiblockchange);
}
public void handleBlockDig(Packet14BlockDig packet14blockdig)
{
- b(packet14blockdig);
+ registerPacket(packet14blockdig);
}
public void handleBlockChange(Packet53BlockChange packet53blockchange)
{
- b(packet53blockchange);
+ registerPacket(packet53blockchange);
}
public void handlePreChunk(Packet50PreChunk packet50prechunk)
{
- b(packet50prechunk);
+ registerPacket(packet50prechunk);
}
public void handleNamedEntitySpawn(Packet20NamedEntitySpawn packet20namedentityspawn)
{
- b(packet20namedentityspawn);
+ registerPacket(packet20namedentityspawn);
}
public void handleEntity(Packet30Entity packet30entity)
{
- b(packet30entity);
+ registerPacket(packet30entity);
}
public void handleEntityTeleport(Packet34EntityTeleport packet34entityteleport)
{
- b(packet34entityteleport);
+ registerPacket(packet34entityteleport);
}
public void handlePlace(Packet15Place packet15place)
{
- b(packet15place);
+ registerPacket(packet15place);
}
public void handleBlockItemSwitch(Packet16BlockItemSwitch packet16blockitemswitch)
{
- b(packet16blockitemswitch);
+ registerPacket(packet16blockitemswitch);
}
public void handleDestroyEntity(Packet29DestroyEntity packet29destroyentity)
{
- b(packet29destroyentity);
+ registerPacket(packet29destroyentity);
}
public void handlePickupSpawn(Packet21PickupSpawn packet21pickupspawn)
{
- b(packet21pickupspawn);
+ registerPacket(packet21pickupspawn);
}
public void handleCollect(Packet22Collect packet22collect)
{
- b(packet22collect);
+ registerPacket(packet22collect);
}
public void handleChat(Packet3Chat packet3chat)
{
- b(packet3chat);
+ registerPacket(packet3chat);
}
public void handleVehicleSpawn(Packet23VehicleSpawn packet23vehiclespawn)
{
- b(packet23vehiclespawn);
+ registerPacket(packet23vehiclespawn);
}
public void handleArmAnimation(Packet18Animation packet18animation)
{
- b(packet18animation);
+ registerPacket(packet18animation);
}
public void func_21147_a(Packet19EntityAction packet19entityaction)
{
- b(packet19entityaction);
+ registerPacket(packet19entityaction);
}
public void handleHandshake(Packet2Handshake packet2handshake)
{
- b(packet2handshake);
+ registerPacket(packet2handshake);
}
public void handleMobSpawn(Packet24MobSpawn packet24mobspawn)
{
- b(packet24mobspawn);
+ registerPacket(packet24mobspawn);
}
public void handleUpdateTime(Packet4UpdateTime packet4updatetime)
{
- b(packet4updatetime);
+ registerPacket(packet4updatetime);
}
public void handleSpawnPosition(Packet6SpawnPosition packet6spawnposition)
{
- b(packet6spawnposition);
+ registerPacket(packet6spawnposition);
}
public void func_6498_a(Packet28EntityVelocity packet28entityvelocity)
{
- b(packet28entityvelocity);
+ registerPacket(packet28entityvelocity);
}
public void func_21148_a(Packet40EntityMetadata packet40entitymetadata)
{
- b(packet40entitymetadata);
+ registerPacket(packet40entitymetadata);
}
public void func_6497_a(Packet39AttachEntity packet39attachentity)
{
- b(packet39attachentity);
+ registerPacket(packet39attachentity);
}
public void handleUseEntity(Packet7UseEntity packet7useentity)
{
- b(packet7useentity);
+ registerPacket(packet7useentity);
}
public void func_9447_a(Packet38EntityStatus packet38entitystatus)
{
- b(packet38entitystatus);
+ registerPacket(packet38entitystatus);
}
public void handleHealth(Packet8UpdateHealth packet8updatehealth)
{
- b(packet8updatehealth);
+ registerPacket(packet8updatehealth);
}
public void func_9448_a(Packet9Respawn packet9respawn)
{
- b(packet9respawn);
+ registerPacket(packet9respawn);
}
public void func_12245_a(Packet60Explosion packet60explosion)
{
- b(packet60explosion);
+ registerPacket(packet60explosion);
}
public void func_20087_a(Packet100OpenWindow packet100openwindow)
{
- b(packet100openwindow);
+ registerPacket(packet100openwindow);
}
public void func_20092_a(Packet101CloseWindow packet101closewindow)
{
- b(packet101closewindow);
+ registerPacket(packet101closewindow);
}
public void func_20091_a(Packet102WindowClick packet102windowclick)
{
- b(packet102windowclick);
+ registerPacket(packet102windowclick);
}
public void func_20088_a(Packet103SetSlot packet103setslot)
{
- b(packet103setslot);
+ registerPacket(packet103setslot);
}
public void func_20094_a(Packet104WindowItems packet104windowitems)
{
- b(packet104windowitems);
+ registerPacket(packet104windowitems);
}
public void func_20093_a(Packet130UpdateSign packet130updatesign)
{
- b(packet130updatesign);
+ registerPacket(packet130updatesign);
}
public void func_20090_a(Packet105UpdateProgressbar packet105updateprogressbar)
{
- b(packet105updateprogressbar);
+ registerPacket(packet105updateprogressbar);
}
public void handlePlayerInventory(Packet5PlayerInventory packet5playerinventory)
{
- b(packet5playerinventory);
+ registerPacket(packet5playerinventory);
}
public void func_20089_a(Packet106Transaction packet106transaction)
{
- b(packet106transaction);
+ registerPacket(packet106transaction);
}
public void func_21146_a(Packet25EntityPainting packet25entitypainting)
{
- b(packet25entitypainting);
+ registerPacket(packet25entitypainting);
}
public void func_21145_a(Packet54PlayNoteBlock packet54playnoteblock)
{
- b(packet54playnoteblock);
+ registerPacket(packet54playnoteblock);
}
public void func_27245_a(Packet200Statistic packet200statistic)
{
- b(packet200statistic);
+ registerPacket(packet200statistic);
}
public void func_22186_a(Packet17Sleep packet17sleep)
{
- b(packet17sleep);
+ registerPacket(packet17sleep);
}
public void func_22185_a(Packet27Position packet27position)
{
- b(packet27position);
+ registerPacket(packet27position);
}
public void func_25118_a(Packet70Bed packet70bed)
{
- b(packet70bed);
+ registerPacket(packet70bed);
}
public void func_27246_a(Packet71Weather packet71weather)
{
- b(packet71weather);
+ registerPacket(packet71weather);
}
public void func_28116_a(Packet131MapData packet131mapdata)
{
- b(packet131mapdata);
+ registerPacket(packet131mapdata);
}
public void func_28115_a(Packet61DoorChange packet61doorchange)
{
- b(packet61doorchange);
+ registerPacket(packet61doorchange);
}
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/NetworkManager.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/NetworkManager.java
index 889f0a7..87532ca 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/NetworkManager.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/NetworkManager.java
@@ -9,8 +9,8 @@ import java.net.*;
import java.util.*;
// Referenced classes of package net.minecraft.src:
-// Packet, NetHandler, NetworkMasterThread, NetworkReaderThread,
-// NetworkWriterThread
+// Packet, NetHandler, NetworkMasterThread, ThreadCloseConnection,
+// NetworkReaderThread, NetworkWriterThread
public class NetworkManager
{
@@ -69,7 +69,7 @@ public class NetworkManager
}
}
- private void func_28142_c()
+ private void d()
{
try
{
@@ -111,7 +111,7 @@ public class NetworkManager
field_28143_y = true;
}
- private void d()
+ private void e()
{
try
{
@@ -201,6 +201,14 @@ public class NetworkManager
}
}
+ public void func_28142_c()
+ {
+ func_28139_a();
+ isServerTerminating = true;
+ readThread.interrupt();
+ (new ThreadCloseConnection(this)).start();
+ }
+
static boolean isRunning(NetworkManager networkmanager)
{
return networkmanager.isRunning;
@@ -213,12 +221,12 @@ public class NetworkManager
static void c(NetworkManager networkmanager)
{
- networkmanager.d();
+ networkmanager.e();
}
static void d(NetworkManager networkmanager)
{
- networkmanager.func_28142_c();
+ networkmanager.d();
}
static boolean func_28138_e(NetworkManager networkmanager)
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/OpenGlCapsChecker.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/OpenGlCapsChecker.java
index c5266a6..6a93183 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/OpenGlCapsChecker.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/OpenGlCapsChecker.java
@@ -19,6 +19,6 @@ public class OpenGlCapsChecker
return tryCheckOcclusionCapable && GLContext.getCapabilities().GL_ARB_occlusion_query;
}
- private static boolean tryCheckOcclusionCapable = true;
+ private static boolean tryCheckOcclusionCapable = false;
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/PanelCrashReport.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/PanelCrashReport.java
index 8590c67..c39f64b 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/PanelCrashReport.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/PanelCrashReport.java
@@ -31,7 +31,7 @@ public class PanelCrashReport extends Panel
{
s2 = (new StringBuilder()).append(s2).append("Generated ").append((new SimpleDateFormat()).format(new Date())).append("\n").toString();
s2 = (new StringBuilder()).append(s2).append("\n").toString();
- s2 = (new StringBuilder()).append(s2).append("Minecraft: Minecraft Beta 1.6 Test Build 3\n").toString();
+ s2 = (new StringBuilder()).append(s2).append("Minecraft: Minecraft Beta 1.6\n").toString();
s2 = (new StringBuilder()).append(s2).append("OS: ").append(System.getProperty("os.name")).append(" (").append(System.getProperty("os.arch")).append(") version ").append(System.getProperty("os.version")).append("\n").toString();
s2 = (new StringBuilder()).append(s2).append("Java: ").append(System.getProperty("java.version")).append(", ").append(System.getProperty("java.vendor")).append("\n").toString();
s2 = (new StringBuilder()).append(s2).append("VM: ").append(System.getProperty("java.vm.name")).append(" (").append(System.getProperty("java.vm.info")).append("), ").append(System.getProperty("java.vm.vendor")).append("\n").toString();
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/PlayerControllerMP.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/PlayerControllerMP.java
index a53415b..4967bff 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/PlayerControllerMP.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/PlayerControllerMP.java
@@ -57,7 +57,7 @@ public class PlayerControllerMP extends PlayerController
{
if(!field_9439_j || i != field_9445_c || j != field_9444_d || k != field_9443_e)
{
- netClientHandler.func_28117_a(new Packet14BlockDig(0, i, j, k, l));
+ netClientHandler.addToSendQueue(new Packet14BlockDig(0, i, j, k, l));
int i1 = mc.theWorld.getBlockId(i, j, k);
if(i1 > 0 && curBlockDamageMP == 0.0F)
{
@@ -115,7 +115,7 @@ public class PlayerControllerMP extends PlayerController
if(curBlockDamageMP >= 1.0F)
{
field_9439_j = false;
- netClientHandler.func_28117_a(new Packet14BlockDig(2, i, j, k, l));
+ netClientHandler.addToSendQueue(new Packet14BlockDig(2, i, j, k, l));
sendBlockRemoved(i, j, k, l);
curBlockDamageMP = 0.0F;
prevBlockDamageMP = 0.0F;
@@ -165,14 +165,14 @@ public class PlayerControllerMP extends PlayerController
if(i != field_1075_l)
{
field_1075_l = i;
- netClientHandler.func_28117_a(new Packet16BlockItemSwitch(field_1075_l));
+ netClientHandler.addToSendQueue(new Packet16BlockItemSwitch(field_1075_l));
}
}
public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
{
func_730_e();
- netClientHandler.func_28117_a(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem()));
+ netClientHandler.addToSendQueue(new Packet15Place(i, j, k, l, entityplayer.inventory.getCurrentItem()));
boolean flag = super.sendPlaceBlock(entityplayer, world, itemstack, i, j, k, l);
return flag;
}
@@ -180,7 +180,7 @@ public class PlayerControllerMP extends PlayerController
public boolean sendUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack)
{
func_730_e();
- netClientHandler.func_28117_a(new Packet15Place(-1, -1, -1, 255, entityplayer.inventory.getCurrentItem()));
+ netClientHandler.addToSendQueue(new Packet15Place(-1, -1, -1, 255, entityplayer.inventory.getCurrentItem()));
boolean flag = super.sendUseItem(entityplayer, world, itemstack);
return flag;
}
@@ -193,14 +193,14 @@ public class PlayerControllerMP extends PlayerController
public void func_6472_b(EntityPlayer entityplayer, Entity entity)
{
func_730_e();
- netClientHandler.func_28117_a(new Packet7UseEntity(entityplayer.entityId, entity.entityId, 1));
+ netClientHandler.addToSendQueue(new Packet7UseEntity(entityplayer.entityId, entity.entityId, 1));
entityplayer.attackTargetEntityWithCurrentItem(entity);
}
public void func_6475_a(EntityPlayer entityplayer, Entity entity)
{
func_730_e();
- netClientHandler.func_28117_a(new Packet7UseEntity(entityplayer.entityId, entity.entityId, 0));
+ netClientHandler.addToSendQueue(new Packet7UseEntity(entityplayer.entityId, entity.entityId, 0));
entityplayer.useCurrentItemOnEntity(entity);
}
@@ -208,7 +208,7 @@ public class PlayerControllerMP extends PlayerController
{
short word0 = entityplayer.craftingInventory.func_20111_a(entityplayer.inventory);
ItemStack itemstack = super.func_27174_a(i, j, k, flag, entityplayer);
- netClientHandler.func_28117_a(new Packet102WindowClick(i, j, k, flag, itemstack, word0));
+ netClientHandler.addToSendQueue(new Packet102WindowClick(i, j, k, flag, itemstack, word0));
return itemstack;
}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/PlayerControllerSP.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/PlayerControllerSP.java
index 77283aa..f3fe97d 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/PlayerControllerSP.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/PlayerControllerSP.java
@@ -56,6 +56,7 @@ public class PlayerControllerSP extends PlayerController
public void clickBlock(int i, int j, int k, int l)
{
+ mc.theWorld.onBlockHit(mc.thePlayer, i, j, k, l);
int i1 = mc.theWorld.getBlockId(i, j, k);
if(i1 > 0 && curBlockDamage == 0.0F)
{
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/RenderBlocks.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/RenderBlocks.java
index eddb070..3df82cc 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/RenderBlocks.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/RenderBlocks.java
@@ -1127,7 +1127,7 @@ public class RenderBlocks
double d2 = k;
if(block == Block.field_9257_X)
{
- long l1 = i * 0x2fc20f + k * 0x5d8875 + j;
+ long l1 = (long)(i * 0x2fc20f) ^ (long)k * 0x6ebfff5L ^ (long)j;
l1 = l1 * l1 * 0x285b825L + l1 * 11L;
d += ((double)((float)(l1 >> 16 & 15L) / 15F) - 0.5D) * 0.5D;
d1 += ((double)((float)(l1 >> 20 & 15L) / 15F) - 1.0D) * 0.20000000000000001D;
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/RenderGlobal.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/RenderGlobal.java
index c8df661..7d6d2f1 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/RenderGlobal.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/RenderGlobal.java
@@ -438,6 +438,7 @@ public class RenderGlobal
markRenderersForNewPosition(MathHelper.floor_double(entityliving.posX), MathHelper.floor_double(entityliving.posY), MathHelper.floor_double(entityliving.posZ));
Arrays.sort(sortedWorldRenderers, new EntitySorter(entityliving));
}
+ RenderHelper.disableStandardItemLighting();
int k = 0;
if(occlusionEnabled && mc.gameSettings.advancedOpengl && !mc.gameSettings.anaglyph && i == 0)
{
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/ThreadCheckHasPaid.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/ThreadCheckHasPaid.java
index 40652ce..9519a02 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/ThreadCheckHasPaid.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/ThreadCheckHasPaid.java
@@ -24,12 +24,12 @@ public class ThreadCheckHasPaid extends Thread
{
try
{
- String s = (new StringBuilder()).append("http://login.minecraft.net/session?name=").append(field_28146_a.session.username).append("&session=").append(field_28146_a.session.sessionId).toString();
+ String s = (new StringBuilder()).append("https://login.minecraft.net/session?name=").append(field_28146_a.session.username).append("&session=").append(field_28146_a.session.sessionId).toString();
URL url = new URL(s);
HttpURLConnection httpurlconnection = (HttpURLConnection)url.openConnection();
httpurlconnection.connect();
int i = httpurlconnection.getResponseCode();
- if(i != 200)
+ if(i == 400)
{
Minecraft.field_28005_H = System.currentTimeMillis();
}
diff --git a/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/ThreadCloseConnection.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/ThreadCloseConnection.java
new file mode 100644
index 0000000..3aab5eb
--- /dev/null
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/ThreadCloseConnection.java
@@ -0,0 +1,38 @@
+// Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov.
+// Jad home page: http://www.kpdus.com/jad.html
+// Decompiler options: packimports(3) braces deadcode
+
+package net.minecraft.src;
+
+
+// Referenced classes of package net.minecraft.src:
+// NetworkManager
+
+class ThreadCloseConnection extends Thread
+{
+
+ ThreadCloseConnection(NetworkManager networkmanager)
+ {
+ field_28109_a = networkmanager;
+// super();
+ }
+
+ public void run()
+ {
+ try
+ {
+ Thread.sleep(2000L);
+ if(NetworkManager.isRunning(field_28109_a))
+ {
+ NetworkManager.getWriteThread(field_28109_a).interrupt();
+ field_28109_a.networkShutdown("disconnect.closed", new Object[0]);
+ }
+ }
+ catch(Exception exception)
+ {
+ exception.printStackTrace();
+ }
+ }
+
+ final NetworkManager field_28109_a; /* synthetic field */
+}
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/ThreadConnectToServer.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/ThreadConnectToServer.java
index fa986bb..a75b91a 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/ThreadConnectToServer.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/ThreadConnectToServer.java
@@ -33,7 +33,7 @@ class ThreadConnectToServer extends Thread
{
return;
}
- GuiConnecting.getNetClientHandler(connectingGui).func_28117_a(new Packet2Handshake(mc.session.username));
+ GuiConnecting.getNetClientHandler(connectingGui).addToSendQueue(new Packet2Handshake(mc.session.username));
}
catch(UnknownHostException unknownhostexception)
{
diff --git a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/World.java b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/World.java
index 635ec4d..fc871fe 100644
--- a/C:/pokechu22/mcp32-1.6-pre3/src/minecraft/net/minecraft/src/World.java
+++ b/C:/pokechu22/mcp32-1.6/src/minecraft/net/minecraft/src/World.java
@@ -10,14 +10,13 @@ import java.util.*;
// Referenced classes of package net.minecraft.src:
// ChunkCoordinates, Vec3D, EntityLightningBolt, IChunkProvider,
// SpawnerAnimals, EnumSkyBlock, WorldInfo, AxisAlignedBB,
-// ChunkCache, Pathfinder, Item, EntityPlayer,
-// MapStorage, MathHelper, ItemStack, TileEntityChest,
-// BiomeGenBase, ChunkProviderLoadOrGenerate, Chunk, Material,
-// ChunkProvider, TileEntity, IWorldAccess, Explosion,
-// NextTickListEntry, BlockFluid, Entity, MetadataChunkBlock,
-// Block, ISaveHandler, WorldProvider, IBlockAccess,
-// WorldChunkManager, IProgressUpdate, BlockFire, ChunkCoordIntPair,
-// MovingObjectPosition, PathEntity, MapDataBase
+// ChunkCache, Pathfinder, EntityPlayer, MapStorage,
+// MathHelper, BiomeGenBase, ChunkProviderLoadOrGenerate, Chunk,
+// Material, ChunkProvider, TileEntity, IWorldAccess,
+// Explosion, NextTickListEntry, BlockFluid, Entity,
+// MetadataChunkBlock, Block, ISaveHandler, WorldProvider,
+// IBlockAccess, WorldChunkManager, IProgressUpdate, BlockFire,
+// ChunkCoordIntPair, MovingObjectPosition, PathEntity, MapDataBase
public class World
implements IBlockAccess
@@ -200,52 +199,6 @@ public class World
worldInfo.setSpawn(i, byte0, j);
findingSpawnPoint = false;
- int k = i - 10;
- int l = j - 3;
- int i1 = getHeightValue(k, l);
- setBlockWithNotify(k, i1, l, Block.chest.blockID);
- TileEntityChest tileentitychest = (TileEntityChest)getBlockTileEntity(k, i1, l);
- int l1 = 0;
- for(int i2 = 0; i2 < 256; i2++)
- {
- if(Block.blocksList[i2] == null)
- {
- continue;
- }
- if(tileentitychest != null)
- {
- tileentitychest.setInventorySlotContents(l1, new ItemStack(Block.blocksList[i2], 64));
- }
- if(++l1 == 27)
- {
- l1 = 0;
- k += 2;
- int j1 = getHeightValue(k, l);
- setBlockWithNotify(k, j1, l, Block.chest.blockID);
- tileentitychest = (TileEntityChest)getBlockTileEntity(k, j1, l);
- }
- }
-
- for(int j2 = 0; j2 < Item.itemsList.length; j2++)
- {
- if(Item.itemsList[j2] == null)
- {
- continue;
- }
- if(tileentitychest != null)
- {
- tileentitychest.setInventorySlotContents(l1, new ItemStack(Item.itemsList[j2], Item.itemsList[j2].getItemStackLimit()));
- }
- if(++l1 == 27)
- {
- l1 = 0;
- k += 2;
- int k1 = getHeightValue(k, l);
- setBlockWithNotify(k, k1, l, Block.chest.blockID);
- tileentitychest = (TileEntityChest)getBlockTileEntity(k, k1, l);
- }
- }
-
}
public void setSpawnLocation()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment