ForgePatch/patches/common/net/minecraft/server/MinecraftServer.java.patch

125 lines
4.4 KiB
Diff
Raw Normal View History

--- ../src_base/common/net/minecraft/server/MinecraftServer.java
+++ ../src_work/common/net/minecraft/server/MinecraftServer.java
@@ -9,6 +9,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
@@ -58,6 +59,7 @@
import net.minecraft.src.WorldServerMulti;
import net.minecraft.src.WorldSettings;
import net.minecraft.src.WorldType;
+import net.minecraftforge.common.DimensionManager;
public abstract class MinecraftServer implements Runnable, IPlayerUsage, ICommandSender
{
2012-08-11 03:30:59 +00:00
@@ -129,7 +131,10 @@
public final long[] tickTimeArray = new long[100];
/** stats are [dimension][tick%100] system.nanoTime is stored. */
- public long[][] timeOfLastDimenstionTick;
+ //public long[][] timeOfLastDimenstionTick;
2012-08-11 03:30:59 +00:00
+ public List<WorldServer> worlds = new ArrayList<WorldServer>();
+ public Hashtable<Integer, long[]> worldTickTimes = new Hashtable<Integer, long[]>();
+ public int spawnProtectionSize = 16;
private KeyPair serverKeyPair;
/** Username of the server owner (for integrated servers) */
2012-08-11 03:30:59 +00:00
@@ -196,8 +201,6 @@
{
this.convertMapIfNeeded(par1Str);
this.setUserMessage("menu.loadingLevel");
2012-08-11 03:30:59 +00:00
- this.theWorldServer = new WorldServer[3];
- this.timeOfLastDimenstionTick = new long[this.theWorldServer.length][100];
ISaveHandler var6 = this.anvilConverterForAnvilFile.getSaveLoader(par1Str, true);
WorldInfo var8 = var6.loadWorldInfo();
WorldSettings var7;
2012-08-11 03:30:59 +00:00
@@ -216,46 +219,18 @@
var7.enableBonusChest();
}
2012-08-11 03:30:59 +00:00
- for (int var9 = 0; var9 < this.theWorldServer.length; ++var9)
- {
- byte var10 = 0;
-
- if (var9 == 1)
- {
- var10 = -1;
- }
-
- if (var9 == 2)
- {
- var10 = 1;
- }
-
- if (var9 == 0)
- {
- if (this.isDemo())
- {
2012-08-11 03:30:59 +00:00
- this.theWorldServer[var9] = new DemoWorldServer(this, var6, par2Str, var10, this.theProfiler);
- }
- else
- {
2012-08-11 03:30:59 +00:00
- this.theWorldServer[var9] = new WorldServer(this, var6, par2Str, var10, var7, this.theProfiler);
- }
- }
- else
- {
2012-08-11 03:30:59 +00:00
- this.theWorldServer[var9] = new WorldServerMulti(this, var6, par2Str, var10, var7, this.theWorldServer[0], this.theProfiler);
- }
-
2012-08-11 03:30:59 +00:00
- this.theWorldServer[var9].addWorldAccess(new WorldManager(this, this.theWorldServer[var9]));
-
+ WorldServer overWorld = (isDemo() ? new DemoWorldServer(this, var6, par2Str, 0, theProfiler) : new WorldServer(this, var6, par2Str, 0, var7, theProfiler));
+ for (int dim : DimensionManager.getIDs())
+ {
+ WorldServer world = (dim == 0 ? overWorld : new WorldServerMulti(this, var6, par2Str, dim, var7, overWorld, theProfiler));
+ world.addWorldAccess(new WorldManager(this, world));
if (!this.isSinglePlayer())
{
2012-08-11 03:30:59 +00:00
- this.theWorldServer[var9].getWorldInfo().setGameType(this.getGameType());
- }
-
2012-08-11 03:30:59 +00:00
- this.serverConfigManager.setPlayerManager(this.theWorldServer);
- }
-
+ world.getWorldInfo().setGameType(this.getGameType());
+ }
+ }
+
+ this.serverConfigManager.setPlayerManager(new WorldServer[]{ overWorld });
this.setDifficultyForAllDimensions(this.getDifficulty());
this.initialWorldChunkLoad();
}
2012-08-11 03:30:59 +00:00
@@ -653,7 +628,7 @@
}
}
- this.timeOfLastDimenstionTick[var1][this.tickCounter % 100] = System.nanoTime() - var2;
2012-08-11 03:30:59 +00:00
+ worldTickTimes.get(var1)[this.tickCounter % 100] = System.nanoTime() - var2;
}
this.theProfiler.endStartSection("connection");
2012-08-11 03:30:59 +00:00
@@ -702,7 +677,8 @@
public WorldServer worldServerForDimension(int par1)
{
2012-08-11 03:30:59 +00:00
- return par1 == -1 ? this.theWorldServer[1] : (par1 == 1 ? this.theWorldServer[2] : this.theWorldServer[0]);
+ WorldServer ret = DimensionManager.getWorld(par1);
+ return (ret != null ? ret : DimensionManager.getWorld(0));
}
@SideOnly(Side.SERVER)
2012-08-11 03:30:59 +00:00
@@ -791,7 +767,7 @@
public String getServerModName()
{
- return "vanilla";
+ return "forge,fml";
}
/**