diff --git a/forge/conf/patches/me.java b/forge/conf/patches/me.java deleted file mode 100644 index df7f73b931..0000000000 --- a/forge/conf/patches/me.java +++ /dev/null @@ -1,10 +0,0 @@ -// this is needed for the sound engine to work with deobfuscated sourcecode without crashing - -public class me -{ - public static int c(double d) - { - int i = (int)d; - return d >= (double)i ? i : i - 1; - } -} diff --git a/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch deleted file mode 100644 index ca03dd7a4a..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -@@ -30,9 +30,9 @@ - throws IOException - { - windowId = datainputstream.readByte(); -- inventoryType = datainputstream.readByte(); -+ inventoryType = datainputstream.readByte()&0xFF; - windowTitle = readString(datainputstream, 16); -- slotsCount = datainputstream.readByte(); -+ slotsCount = datainputstream.readByte()&0xFF; - } - - public void writePacketData(DataOutputStream dataoutputstream) diff --git a/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch deleted file mode 100644 index 4a9e792aae..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -@@ -15,7 +15,7 @@ - { - - public int entityId; -- public byte type; -+ public int type; - public int xPosition; - public int yPosition; - public int zPosition; -@@ -44,7 +44,7 @@ - throws IOException - { - entityId = datainputstream.readInt(); -- type = datainputstream.readByte(); -+ type = datainputstream.readByte() & 0xFF; - xPosition = datainputstream.readInt(); - yPosition = datainputstream.readInt(); - zPosition = datainputstream.readInt(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch deleted file mode 100644 index 9eda3eae1f..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -@@ -38,9 +38,9 @@ - throws IOException - { - windowId = datainputstream.readByte(); -- inventoryType = datainputstream.readByte(); -+ inventoryType = datainputstream.readByte()&0xFF; - windowTitle = readString(datainputstream, 16); -- slotsCount = datainputstream.readByte(); -+ slotsCount = datainputstream.readByte()&0xFF; - } - - public void writePacketData(DataOutputStream dataoutputstream) diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch deleted file mode 100644 index 886ae732c3..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -@@ -15,7 +15,7 @@ - { - - public int entityId; -- public byte type; -+ public int type; - public int xPosition; - public int yPosition; - public int zPosition; -@@ -44,7 +44,7 @@ - throws IOException - { - entityId = datainputstream.readInt(); -- type = datainputstream.readByte(); -+ type = datainputstream.readByte() & 0xFF; - xPosition = datainputstream.readInt(); - yPosition = datainputstream.readInt(); - zPosition = datainputstream.readInt(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch deleted file mode 100644 index 1547e7a4bf..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 -@@ -183,12 +183,11 @@ - sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); - for(int k = 0; k < numBlocksToUpdate; k++) - { -- int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf); -- int i2 = numBlocksToUpdate & 0xff; -- int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf); -+ int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf); -+ int i2 = blocksToUpdate[k] & 0xff; -+ int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf); - if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)]) - { -- System.out.println("Sending!"); - updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2)); - } - }