From 57dcfc5dd0e7b39e8895a56edc9cb502970130c3 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 14 Aug 2012 23:58:32 -0700 Subject: [PATCH] Updated patches to 1.3.2 --- .../server/MinecraftServer.java.patch | 6 +-- .../minecraft/src/DedicatedServer.java.patch | 2 +- .../minecraft/src/NetServerHandler.java.patch | 6 +-- .../net/minecraft/src/WorldServer.java.patch | 8 ++-- .../src/GuiStatsComponent.java.patch | 40 ------------------- 5 files changed, 11 insertions(+), 51 deletions(-) delete mode 100644 patches/minecraft_server/net/minecraft/src/GuiStatsComponent.java.patch diff --git a/patches/common/net/minecraft/server/MinecraftServer.java.patch b/patches/common/net/minecraft/server/MinecraftServer.java.patch index 62cffc94e..c694e5397 100644 --- a/patches/common/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/common/net/minecraft/server/MinecraftServer.java.patch @@ -112,7 +112,7 @@ this.theProfiler.startSection(var4.getWorldInfo().getWorldName()); if (this.tickCounter % 20 == 0) -@@ -653,7 +628,7 @@ +@@ -648,7 +623,7 @@ } } @@ -121,7 +121,7 @@ } this.theProfiler.endStartSection("connection"); -@@ -702,7 +677,8 @@ +@@ -697,7 +672,8 @@ public WorldServer worldServerForDimension(int par1) { @@ -131,7 +131,7 @@ } @SideOnly(Side.SERVER) -@@ -791,7 +767,7 @@ +@@ -786,7 +762,7 @@ public String getServerModName() { diff --git a/patches/common/net/minecraft/src/DedicatedServer.java.patch b/patches/common/net/minecraft/src/DedicatedServer.java.patch index 064804a2b..c8ea4d661 100644 --- a/patches/common/net/minecraft/src/DedicatedServer.java.patch +++ b/patches/common/net/minecraft/src/DedicatedServer.java.patch @@ -1,6 +1,6 @@ --- ../src_base/common/net/minecraft/src/DedicatedServer.java +++ ../src_work/common/net/minecraft/src/DedicatedServer.java -@@ -66,6 +66,7 @@ +@@ -67,6 +67,7 @@ this.setAllowFlight(this.settings.getOrSetBoolProperty("allow-flight", false)); this.setTexturePack(this.settings.getOrSetProperty("texture-pack", "")); this.setMOTD(this.settings.getOrSetProperty("motd", "A Minecraft Server")); diff --git a/patches/common/net/minecraft/src/NetServerHandler.java.patch b/patches/common/net/minecraft/src/NetServerHandler.java.patch index ffd879a5e..15e242e2e 100644 --- a/patches/common/net/minecraft/src/NetServerHandler.java.patch +++ b/patches/common/net/minecraft/src/NetServerHandler.java.patch @@ -1,6 +1,6 @@ --- ../src_base/common/net/minecraft/src/NetServerHandler.java +++ ../src_work/common/net/minecraft/src/NetServerHandler.java -@@ -383,7 +383,10 @@ +@@ -388,7 +388,10 @@ double var12 = this.playerEntity.posZ - ((double)var7 + 0.5D); double var14 = var8 * var8 + var10 * var10 + var12 * var12; @@ -12,7 +12,7 @@ { return; } -@@ -405,7 +408,7 @@ +@@ -410,7 +413,7 @@ if (par1Packet14BlockDig.status == 0) { @@ -21,7 +21,7 @@ { this.playerEntity.serverForThisPlayer.sendPacketToPlayer(new Packet53BlockChange(var5, var6, var7, var2)); } -@@ -485,7 +488,9 @@ +@@ -490,7 +493,9 @@ var12 = var11; } diff --git a/patches/common/net/minecraft/src/WorldServer.java.patch b/patches/common/net/minecraft/src/WorldServer.java.patch index 975b2e6f1..2867483af 100644 --- a/patches/common/net/minecraft/src/WorldServer.java.patch +++ b/patches/common/net/minecraft/src/WorldServer.java.patch @@ -10,7 +10,7 @@ public class WorldServer extends World { -@@ -70,6 +73,7 @@ +@@ -71,6 +74,7 @@ { this.pendingTickListEntries = new TreeSet(); } @@ -18,7 +18,7 @@ } /** -@@ -538,15 +542,27 @@ +@@ -559,15 +563,27 @@ public List getAllTileEntityInBox(int par1, int par2, int par3, int par4, int par5, int par6) { ArrayList var7 = new ArrayList(); @@ -55,7 +55,7 @@ } } -@@ -566,7 +582,7 @@ +@@ -587,7 +603,7 @@ var6 = var5; } @@ -64,7 +64,7 @@ } protected void initialize(WorldSettings par1WorldSettings) -@@ -689,6 +705,7 @@ +@@ -710,6 +726,7 @@ } this.chunkProvider.saveChunks(par1, par2IProgressUpdate); diff --git a/patches/minecraft_server/net/minecraft/src/GuiStatsComponent.java.patch b/patches/minecraft_server/net/minecraft/src/GuiStatsComponent.java.patch deleted file mode 100644 index 3fe1bc799..000000000 --- a/patches/minecraft_server/net/minecraft/src/GuiStatsComponent.java.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/GuiStatsComponent.java -+++ ../src_work/minecraft_server/net/minecraft/src/GuiStatsComponent.java -@@ -9,6 +9,7 @@ - import javax.swing.JComponent; - import javax.swing.Timer; - import net.minecraft.server.MinecraftServer; -+import net.minecraftforge.common.DimensionManager; - - @SideOnly(Side.SERVER) - public class GuiStatsComponent extends JComponent -@@ -42,6 +43,7 @@ - */ - private void updateStats() - { -+ this.displayStrings = new String[5 + DimensionManager.getIDs().length]; - long var1 = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); - System.gc(); - this.displayStrings[0] = "Memory use: " + var1 / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)"; -@@ -52,14 +54,17 @@ - - if (this.field_79017_e.theWorldServer != null) - { -- for (int var3 = 0; var3 < this.field_79017_e.theWorldServer.length; ++var3) -+ int x = 0; -+ for (Integer id : DimensionManager.getIDs()) - { -- this.displayStrings[5 + var3] = "Lvl " + var3 + " tick: " + field_79020_a.format(this.func_79015_a(this.field_79017_e.timeOfLastDimenstionTick[var3]) * 1.0E-6D) + " ms"; -+ this.displayStrings[5 + x] = "Lvl " + id + " tick: " + field_79020_a.format(this.func_79015_a(this.field_79017_e.worldTickTimes.get(id)) * 1.0E-6D) + " ms"; - -- if (this.field_79017_e.theWorldServer[var3] != null && this.field_79017_e.theWorldServer[var3].theChunkProviderServer != null) -+ WorldServer world = DimensionManager.getWorld(id); -+ if (world != null && world.theChunkProviderServer != null) - { -- this.displayStrings[5 + var3] = this.displayStrings[5 + var3] + ", " + this.field_79017_e.theWorldServer[var3].theChunkProviderServer.makeString(); -+ this.displayStrings[5 + x] = this.displayStrings[5 + x] + ", " + world.theChunkProviderServer.makeString(); - } -+ x++; - } - } -