175 lines
8.1 KiB
Diff
175 lines
8.1 KiB
Diff
--- a/net/minecraft/server/MinecraftServer.java
|
|
+++ b/net/minecraft/server/MinecraftServer.java
|
|
@@ -336,6 +336,8 @@
|
|
ServerWorld serverworld = new ServerWorld(this, this.field_213217_au, this.field_71310_m, iserverworldinfo, World.field_234918_g_, registrykey, dimensiontype, p_240787_1_, chunkgenerator, flag, j, list, true);
|
|
this.field_71305_c.put(World.field_234918_g_, serverworld);
|
|
DimensionSavedDataManager dimensionsaveddatamanager = serverworld.func_217481_x();
|
|
+ // Move factory creation earlier to prevent startupquery deadlock
|
|
+ IChunkStatusListener ichunkstatuslistener = this.field_213220_d.create(11);
|
|
this.func_213204_a(dimensionsaveddatamanager);
|
|
this.field_229733_al_ = new CommandStorage(dimensionsaveddatamanager);
|
|
WorldBorder worldborder = serverworld.func_175723_af();
|
|
@@ -380,6 +382,7 @@
|
|
worldborder.func_177737_a(new IBorderListener.Impl(serverworld1.func_175723_af()));
|
|
this.field_71305_c.put(registrykey2, serverworld1);
|
|
}
|
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Load(field_71305_c.get(registrykey1)));
|
|
}
|
|
|
|
}
|
|
@@ -391,6 +394,7 @@
|
|
} else if (p_240786_3_) {
|
|
p_240786_1_.func_176143_a(BlockPos.field_177992_a.func_177984_a());
|
|
} else {
|
|
+ if (net.minecraftforge.event.ForgeEventFactory.onCreateWorldSpawn(p_240786_0_, p_240786_1_)) return;
|
|
BiomeProvider biomeprovider = chunkgenerator.func_202090_b();
|
|
List<Biome> list = biomeprovider.func_76932_a();
|
|
Random random = new Random(p_240786_0_.func_72905_C());
|
|
@@ -569,6 +573,7 @@
|
|
for(ServerWorld serverworld1 : this.func_212370_w()) {
|
|
if (serverworld1 != null) {
|
|
try {
|
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Unload(serverworld1));
|
|
serverworld1.close();
|
|
} catch (IOException ioexception1) {
|
|
field_147145_h.error("Exception closing the level", (Throwable)ioexception1);
|
|
@@ -617,6 +622,7 @@
|
|
protected void func_240802_v_() {
|
|
try {
|
|
if (this.func_71197_b()) {
|
|
+ net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerStarted(this);
|
|
this.field_211151_aa = Util.func_211177_b();
|
|
this.field_147147_p.func_151315_a(new StringTextComponent(this.field_71286_C));
|
|
this.field_147147_p.func_151321_a(new ServerStatusResponse.Version(SharedConstants.func_215069_a().getName(), SharedConstants.func_215069_a().getProtocolVersion()));
|
|
@@ -646,9 +652,15 @@
|
|
this.func_240795_b_(longtickdetector);
|
|
this.field_71296_Q = true;
|
|
}
|
|
+ net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerStopping(this);
|
|
+ net.minecraftforge.fml.server.ServerLifecycleHooks.expectServerStopped(); // has to come before finalTick to avoid race conditions
|
|
} else {
|
|
+ net.minecraftforge.fml.server.ServerLifecycleHooks.expectServerStopped(); // has to come before finalTick to avoid race conditions
|
|
this.func_71228_a((CrashReport)null);
|
|
}
|
|
+ } catch (net.minecraftforge.fml.StartupQuery.AbortedException e) {
|
|
+ // ignore silently
|
|
+ net.minecraftforge.fml.server.ServerLifecycleHooks.expectServerStopped(); // has to come before finalTick to avoid race conditions
|
|
} catch (Throwable throwable1) {
|
|
field_147145_h.error("Encountered an unexpected exception", throwable1);
|
|
CrashReport crashreport;
|
|
@@ -665,6 +677,7 @@
|
|
field_147145_h.error("We were unable to save this crash report to disk.");
|
|
}
|
|
|
|
+ net.minecraftforge.fml.server.ServerLifecycleHooks.expectServerStopped(); // has to come before finalTick to avoid race conditions
|
|
this.func_71228_a(crashreport);
|
|
} finally {
|
|
try {
|
|
@@ -673,6 +686,7 @@
|
|
} catch (Throwable throwable) {
|
|
field_147145_h.error("Exception stopping the server", throwable);
|
|
} finally {
|
|
+ net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerStopped(this);
|
|
this.func_71240_o();
|
|
}
|
|
|
|
@@ -774,6 +788,7 @@
|
|
|
|
protected void func_71217_p(BooleanSupplier p_71217_1_) {
|
|
long i = Util.func_211178_c();
|
|
+ net.minecraftforge.fml.hooks.BasicEventHooks.onPreServerTick();
|
|
++this.field_71315_w;
|
|
this.func_71190_q(p_71217_1_);
|
|
if (i - this.field_147142_T >= 5000000000L) {
|
|
@@ -788,6 +803,7 @@
|
|
|
|
Collections.shuffle(Arrays.asList(agameprofile));
|
|
this.field_147147_p.func_151318_b().func_151330_a(agameprofile);
|
|
+ this.field_147147_p.invalidateJson();
|
|
}
|
|
|
|
if (this.field_71315_w % 6000 == 0) {
|
|
@@ -815,6 +831,7 @@
|
|
long i1 = Util.func_211178_c();
|
|
this.field_213215_ap.func_181747_a(i1 - i);
|
|
this.field_71304_b.func_76319_b();
|
|
+ net.minecraftforge.fml.hooks.BasicEventHooks.onPostServerTick();
|
|
}
|
|
|
|
protected void func_71190_q(BooleanSupplier p_71190_1_) {
|
|
@@ -822,7 +839,8 @@
|
|
this.func_193030_aL().func_73660_a();
|
|
this.field_71304_b.func_219895_b("levels");
|
|
|
|
- for(ServerWorld serverworld : this.func_212370_w()) {
|
|
+ for(ServerWorld serverworld : this.getWorldArray()) {
|
|
+ long tickStart = Util.func_211178_c();
|
|
this.field_71304_b.func_194340_a(() -> {
|
|
return serverworld + " " + serverworld.func_234923_W_().func_240901_a_();
|
|
});
|
|
@@ -833,6 +851,7 @@
|
|
}
|
|
|
|
this.field_71304_b.func_76320_a("tick");
|
|
+ net.minecraftforge.fml.hooks.BasicEventHooks.onPreWorldTick(serverworld);
|
|
|
|
try {
|
|
serverworld.func_72835_b(p_71190_1_);
|
|
@@ -931,6 +950,7 @@
|
|
p_71230_1_.func_85056_g().func_189529_a("Data Packs", () -> {
|
|
StringBuilder stringbuilder = new StringBuilder();
|
|
|
|
+ LogManager.shutdown(); // we're manually managing the logging shutdown on the server. Make sure we do it here at the end.
|
|
for(ResourcePackInfo resourcepackinfo : this.field_195577_ad.func_198980_d()) {
|
|
if (stringbuilder.length() > 0) {
|
|
stringbuilder.append(", ");
|
|
@@ -1284,6 +1304,7 @@
|
|
}
|
|
|
|
public static DatapackCodec func_240772_a_(ResourcePackList<ResourcePackInfo> p_240772_0_, DatapackCodec p_240772_1_, boolean p_240772_2_) {
|
|
+ net.minecraftforge.fml.packs.ResourcePackLoader.loadResourcePacks(p_240772_0_, net.minecraftforge.fml.server.ServerLifecycleHooks::buildPackFinder);
|
|
p_240772_0_.func_198983_a();
|
|
if (p_240772_2_) {
|
|
p_240772_0_.func_198985_a(Collections.singleton("vanilla"));
|
|
@@ -1437,6 +1458,31 @@
|
|
|
|
public abstract boolean func_213199_b(GameProfile p_213199_1_);
|
|
|
|
+ private Map<RegistryKey<World>, long[]> perWorldTickTimes = Maps.newIdentityHashMap();
|
|
+ @Nullable
|
|
+ public long[] getTickTime(RegistryKey<World> dim) {
|
|
+ return perWorldTickTimes.get(dim);
|
|
+ }
|
|
+
|
|
+ @Deprecated //Forge Internal use Only, You can screw up a lot of things if you mess with this map.
|
|
+ public synchronized Map<RegistryKey<World>, ServerWorld> forgeGetWorldMap() {
|
|
+ return this.field_71305_c;
|
|
+ }
|
|
+ private int worldArrayMarker = 0;
|
|
+ private int worldArrayLast = -1;
|
|
+ private ServerWorld[] worldArray;
|
|
+ @Deprecated //Forge Internal use Only, use to protect against concurrent modifications in the world tick loop.
|
|
+ public synchronized void markWorldsDirty() {
|
|
+ worldArrayMarker++;
|
|
+ }
|
|
+ private ServerWorld[] getWorldArray() {
|
|
+ if (worldArrayMarker == worldArrayLast && worldArray != null)
|
|
+ return worldArray;
|
|
+ worldArray = this.field_71305_c.values().stream().toArray(x -> new ServerWorld[x]);
|
|
+ worldArrayLast = worldArrayMarker;
|
|
+ return worldArray;
|
|
+ }
|
|
+
|
|
public void func_223711_a(Path p_223711_1_) throws IOException {
|
|
Path path = p_223711_1_.resolve("levels");
|
|
|
|
@@ -1564,4 +1610,8 @@
|
|
public IServerConfiguration func_240793_aU_() {
|
|
return this.field_240768_i_;
|
|
}
|
|
+
|
|
+ public DataPackRegistries getDataPackRegistries() {
|
|
+ return field_195576_ac;
|
|
+ }
|
|
}
|