keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fixed Diemsnion API related NPEs, and updated FML to 231.

Browse source
This commit is contained in:
LexManos 2012-08-11 03:08:09 -07:00
parent 55636eabab
commit ba55320462
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
fml-src-2.9.129.225.zip
View file

Binary file not shown.

BIN
fml-src-2.9.138.231.zip Normal file
View file

Binary file not shown.

20
patches/common/net/minecraft/server/MinecraftServer.java.patch
View file

@ -94,12 +94,30 @@
this.setDifficultyForAllDimensions(this.getDifficulty()); this.setDifficultyForAllDimensions(this.getDifficulty());
this.initialWorldChunkLoad(); this.initialWorldChunkLoad();
} }
@@ -611,13 +586,13 @@
{
this.theProfiler.startSection("levels");
- for (int var1 = 0; var1 < this.theWorldServer.length; ++var1)
+ for (Integer id : DimensionManager.getIDs())
{
long var2 = System.nanoTime();
- if (var1 == 0 || this.getAllowNether())
- {
- WorldServer var4 = this.theWorldServer[var1];
+ if (id == 0 || this.getAllowNether())
+ {
+ WorldServer var4 = DimensionManager.getWorld(id);
this.theProfiler.startSection(var4.getWorldInfo().getWorldName());
if (this.tickCounter % 20 == 0)
@@ -653,7 +628,7 @@ @@ -653,7 +628,7 @@
} }
} }
- this.timeOfLastDimenstionTick[var1][this.tickCounter % 100] = System.nanoTime() - var2; - this.timeOfLastDimenstionTick[var1][this.tickCounter % 100] = System.nanoTime() - var2;
+ worldTickTimes.get(var1)[this.tickCounter % 100] = System.nanoTime() - var2; + worldTickTimes.get(id)[this.tickCounter % 100] = System.nanoTime() - var2;
} }
this.theProfiler.endStartSection("connection"); this.theProfiler.endStartSection("connection");

4
patches/minecraft/net/minecraft/src/GuiStatsComponent.java.patch
View file

@ -16,13 +16,13 @@
long var1 = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); long var1 = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
System.gc(); System.gc();
this.displayStrings[0] = "Memory use: " + var1 / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)"; this.displayStrings[0] = "Memory use: " + var1 / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)";
@@ -51,14 +53,18 @@ @@ -51,14 +53,17 @@
if (this.field_79017_e.theWorldServer != null) if (this.field_79017_e.theWorldServer != null)
{ {
- for (int var3 = 0; var3 < this.field_79017_e.theWorldServer.length; ++var3)
+ int x = 0; + int x = 0;
+ for (Integer id : DimensionManager.getIDs()) + for (Integer id : DimensionManager.getIDs())
for (int var3 = 0; var3 < this.field_79017_e.theWorldServer.length; ++var3)
{ {
- 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 + 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"; + 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";