Files
MinecraftForge/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
T
Lex Manos 0fe2584b77 Updated FML:
MinecraftForge/FML@2c56c32c5a Fix saving backups with the raw name. Fix air block not being assigned as the default.
MinecraftForge/FML@d0f8073fa5 Merge pull request #413 from sfPlayer1/master
MinecraftForge/FML@810b1f3075 Clean some generic warnings up. Make a generic list handler. Helpful for others I think too.
MinecraftForge/FML@fff86ee9d3 Fix refreshResources not happening if an error occurs.
MinecraftForge/FML@76d8d0e870 Fix mod version checking
MinecraftForge/FML@b84d0760ae Fix display of mod status at the server
MinecraftForge/FML@251af1d09d Fixed memory leak on the client caused by Netty holding references to the World.
2014-05-07 12:17:52 -07:00

192 lines
7.2 KiB
Diff

--- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java
+++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java
@@ -26,6 +26,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
@@ -74,6 +75,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
+
public abstract class MinecraftServer implements ICommandSender, Runnable, IPlayerUsage
{
private static final Logger field_147145_h = LogManager.getLogger();
@@ -90,7 +95,7 @@
@SideOnly(Side.SERVER)
private String field_71320_r;
private int field_71319_s = -1;
- public WorldServer[] field_71305_c;
+ public WorldServer[] field_71305_c = new WorldServer[0];
private ServerConfigurationManager field_71318_t;
private boolean field_71317_u = true;
private boolean field_71316_v;
@@ -107,7 +112,8 @@
private int field_71280_D;
private int field_143008_E = 0;
public final long[] field_71311_j = new long[100];
- public long[][] field_71312_k;
+ //public long[][] timeOfLastDimensionTick;
+ public Hashtable<Integer, long[]> worldTickTimes = new Hashtable<Integer, long[]>();
private KeyPair field_71292_I;
private String field_71293_J;
private String field_71294_K;
@@ -183,8 +189,6 @@
{
this.func_71237_c(p_71247_1_);
this.func_71192_d("menu.loadingLevel");
- this.field_71305_c = new WorldServer[3];
- this.field_71312_k = new long[this.field_71305_c.length][100];
ISaveHandler isavehandler = this.field_71310_m.func_75804_a(p_71247_1_, true);
WorldInfo worldinfo = isavehandler.func_75757_d();
WorldSettings worldsettings;
@@ -204,46 +208,21 @@
worldsettings.func_77159_a();
}
- for (int j = 0; j < this.field_71305_c.length; ++j)
+ WorldServer overWorld = (func_71242_L() ? new DemoWorldServer(this, isavehandler, p_71247_2_, 0, field_71304_b) : new WorldServer(this, isavehandler, p_71247_2_, 0, worldsettings, field_71304_b));
+ for (int dim : DimensionManager.getStaticDimensionIDs())
{
- byte b0 = 0;
+ WorldServer world = (dim == 0 ? overWorld : new WorldServerMulti(this, isavehandler, p_71247_2_, dim, worldsettings, overWorld, field_71304_b));
+ world.func_72954_a(new WorldManager(this, world));
- if (j == 1)
- {
- b0 = -1;
- }
-
- if (j == 2)
- {
- b0 = 1;
- }
-
- if (j == 0)
- {
- if (this.func_71242_L())
- {
- this.field_71305_c[j] = new DemoWorldServer(this, isavehandler, p_71247_2_, b0, this.field_71304_b);
- }
- else
- {
- this.field_71305_c[j] = new WorldServer(this, isavehandler, p_71247_2_, b0, worldsettings, this.field_71304_b);
- }
- }
- else
- {
- this.field_71305_c[j] = new WorldServerMulti(this, isavehandler, p_71247_2_, b0, worldsettings, this.field_71305_c[0], this.field_71304_b);
- }
-
- this.field_71305_c[j].func_72954_a(new WorldManager(this, this.field_71305_c[j]));
-
if (!this.func_71264_H())
{
- this.field_71305_c[j].func_72912_H().func_76060_a(this.func_71265_f());
+ world.func_72912_H().func_76060_a(this.func_71265_f());
}
- this.field_71318_t.func_72364_a(this.field_71305_c);
+ MinecraftForge.EVENT_BUS.post(new WorldEvent.Load(world));
}
+ this.field_71318_t.func_72364_a(new WorldServer[]{ overWorld });
this.func_147139_a(this.func_147135_j());
this.func_71222_d();
}
@@ -310,6 +289,7 @@
if (!this.field_71290_O)
{
WorldServer[] aworldserver = this.field_71305_c;
+ if (aworldserver == null) return; //Forge: Just in case, NPE protection as it has been encountered.
int i = aworldserver.length;
for (int j = 0; j < i; ++j)
@@ -360,9 +340,16 @@
for (int i = 0; i < this.field_71305_c.length; ++i)
{
WorldServer worldserver = this.field_71305_c[i];
+ MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(worldserver));
worldserver.func_73041_k();
}
+ WorldServer[] tmp = field_71305_c;
+ for (WorldServer world : tmp)
+ {
+ DimensionManager.setWorld(world.field_73011_w.field_76574_g, null);
+ }
+
if (this.field_71307_n.func_76468_d())
{
this.field_71307_n.func_76470_e();
@@ -592,13 +579,15 @@
this.field_71304_b.func_76320_a("levels");
int i;
- for (i = 0; i < this.field_71305_c.length; ++i)
+ Integer[] ids = DimensionManager.getIDs(this.field_71315_w % 200 == 0);
+ for (int x = 0; x < ids.length; x++)
{
+ int id = ids[x];
long j = System.nanoTime();
- if (i == 0 || this.func_71255_r())
+ if (id == 0 || this.func_71255_r())
{
- WorldServer worldserver = this.field_71305_c[i];
+ WorldServer worldserver = DimensionManager.getWorld(id);
this.field_71304_b.func_76320_a(worldserver.func_72912_H().func_76065_j());
this.field_71304_b.func_76320_a("pools");
worldserver.func_82732_R().func_72343_a();
@@ -645,9 +634,11 @@
this.field_71304_b.func_76319_b();
}
- this.field_71312_k[i][this.field_71315_w % 100] = System.nanoTime() - j;
+ worldTickTimes.get(id)[this.field_71315_w % 100] = System.nanoTime() - j;
}
+ this.field_71304_b.func_76318_c("dim_unloading");
+ DimensionManager.unloadWorlds(worldTickTimes);
this.field_71304_b.func_76318_c("connection");
this.func_147137_ag().func_151269_c();
this.field_71304_b.func_76318_c("players");
@@ -692,7 +683,13 @@
public WorldServer func_71218_a(int p_71218_1_)
{
- return p_71218_1_ == -1 ? this.field_71305_c[1] : (p_71218_1_ == 1 ? this.field_71305_c[2] : this.field_71305_c[0]);
+ WorldServer ret = DimensionManager.getWorld(p_71218_1_);
+ if (ret == null)
+ {
+ DimensionManager.initDimension(p_71218_1_);
+ ret = DimensionManager.getWorld(p_71218_1_);
+ }
+ return ret;
}
public String func_71249_w()
@@ -951,6 +948,7 @@
if (worldserver != null)
{
+ MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(worldserver));
worldserver.func_73041_k();
}
}
@@ -1421,7 +1419,6 @@
this.field_147141_M = p_155759_1_;
}
- @SideOnly(Side.SERVER)
public boolean func_71241_aa()
{
return this.field_71316_v;