Files
MinecraftForge/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
T
425eff39ff Update to 1.18.2
Co-authored-by: sciwhiz12 <[email protected]>
Co-authored-by: Marc Hermans <[email protected]>
Co-authored-by: LexManos <[email protected]>
Co-authored-by: Curle <[email protected]>
Signed-off-by: SizableShrimp <[email protected]>
2022-03-01 14:16:46 -08:00

233 lines
9.8 KiB
Diff

--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -257,7 +_,7 @@
public static <S extends MinecraftServer> S m_129872_(Function<Thread, S> p_129873_) {
AtomicReference<S> atomicreference = new AtomicReference<>();
- Thread thread = new Thread(() -> {
+ Thread thread = new Thread(net.minecraftforge.fml.util.thread.SidedThreadGroups.SERVER, () -> {
atomicreference.get().m_130011_();
}, "Server thread");
thread.setUncaughtExceptionHandler((p_177909_, p_177910_) -> {
@@ -358,6 +_,7 @@
this.m_129841_(dimensiondatastorage);
this.f_129732_ = new CommandStorage(dimensiondatastorage);
WorldBorder worldborder = serverlevel.m_6857_();
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Load(f_129762_.get(Level.f_46428_)));
if (!serverleveldata.m_6535_()) {
try {
m_177896_(serverlevel, serverleveldata, worldgensettings.m_64660_(), flag);
@@ -394,6 +_,7 @@
ServerLevel serverlevel1 = new ServerLevel(this, this.f_129738_, this.f_129744_, derivedleveldata, resourcekey1, holder1, p_129816_, chunkgenerator1, flag, j, ImmutableList.of(), false);
worldborder.m_61929_(new BorderChangeListener.DelegateBorderChangeListener(serverlevel1.m_6857_()));
this.f_129762_.put(resourcekey1, serverlevel1);
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Load(f_129762_.get(resourcekey)));
}
}
@@ -405,6 +_,7 @@
p_177898_.m_7250_(BlockPos.f_121853_.m_6630_(80), 0.0F);
} else {
ChunkGenerator chunkgenerator = p_177897_.m_7726_().m_8481_();
+ if (net.minecraftforge.event.ForgeEventFactory.onCreateWorldSpawn(p_177897_, p_177898_)) return;
ChunkPos chunkpos = new ChunkPos(chunkgenerator.m_183403_().m_183230_());
int i = chunkgenerator.m_142051_(p_177897_);
if (i < p_177897_.m_141937_()) {
@@ -485,6 +_,7 @@
ChunkPos chunkpos = new ChunkPos(i);
serverlevel1.m_7726_().m_6692_(chunkpos, true);
}
+ net.minecraftforge.common.world.ForgeChunkManager.reinstatePersistentChunks(serverlevel1, forcedchunkssaveddata);
}
}
@@ -609,6 +_,7 @@
for(ServerLevel serverlevel2 : this.m_129785_()) {
if (serverlevel2 != null) {
try {
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Unload(serverlevel2));
serverlevel2.close();
} catch (IOException ioexception1) {
f_129750_.error("Exception closing the level", (Throwable)ioexception1);
@@ -654,6 +_,7 @@
protected void m_130011_() {
try {
if (this.m_7038_()) {
+ net.minecraftforge.server.ServerLifecycleHooks.handleServerStarted(this);
this.f_129726_ = Util.m_137550_();
this.f_129757_.m_134908_(new TextComponent(this.f_129709_));
this.f_129757_.m_134912_(new ServerStatus.Version(SharedConstants.m_183709_().getName(), SharedConstants.m_183709_().getProtocolVersion()));
@@ -686,7 +_,10 @@
this.f_129717_ = true;
JvmProfiler.f_185340_.m_183597_(this.f_129737_);
}
+ net.minecraftforge.server.ServerLifecycleHooks.handleServerStopping(this);
+ net.minecraftforge.server.ServerLifecycleHooks.expectServerStopped(); // has to come before finalTick to avoid race conditions
} else {
+ net.minecraftforge.server.ServerLifecycleHooks.expectServerStopped(); // has to come before finalTick to avoid race conditions
this.m_7268_((CrashReport)null);
}
} catch (Throwable throwable1) {
@@ -700,6 +_,7 @@
f_129750_.error("We were unable to save this crash report to disk.");
}
+ net.minecraftforge.server.ServerLifecycleHooks.expectServerStopped(); // has to come before finalTick to avoid race conditions
this.m_7268_(crashreport);
} finally {
try {
@@ -712,6 +_,7 @@
this.f_129723_.m_196559_();
}
+ net.minecraftforge.server.ServerLifecycleHooks.handleServerStopped(this);
this.m_6988_();
}
@@ -826,6 +_,7 @@
public void m_5705_(BooleanSupplier p_129871_) {
long i = Util.m_137569_();
+ net.minecraftforge.event.ForgeEventFactory.onPreServerTick();
++this.f_129766_;
this.m_5703_(p_129871_);
if (i - this.f_129724_ >= 5000000000L) {
@@ -847,6 +_,7 @@
Collections.shuffle(Arrays.asList(agameprofile));
this.f_129757_.m_134914_().m_134924_(agameprofile);
}
+ this.f_129757_.invalidateJson();
}
if (this.f_129766_ % 6000 == 0) {
@@ -863,6 +_,7 @@
long i1 = Util.m_137569_();
this.f_129735_.m_13755_(i1 - i);
this.f_129754_.m_7238_();
+ net.minecraftforge.event.ForgeEventFactory.onPostServerTick();
}
public void m_5703_(BooleanSupplier p_129954_) {
@@ -870,7 +_,8 @@
this.m_129890_().m_136128_();
this.f_129754_.m_6182_("levels");
- for(ServerLevel serverlevel : this.m_129785_()) {
+ for(ServerLevel serverlevel : this.getWorldArray()) {
+ long tickStart = Util.m_137569_();
this.f_129754_.m_6521_(() -> {
return serverlevel + " " + serverlevel.m_46472_().m_135782_();
});
@@ -881,6 +_,7 @@
}
this.f_129754_.m_6180_("tick");
+ net.minecraftforge.event.ForgeEventFactory.onPreWorldTick(serverlevel);
try {
serverlevel.m_8793_(p_129954_);
@@ -889,16 +_,18 @@
serverlevel.m_6026_(crashreport);
throw new ReportedException(crashreport);
}
+ net.minecraftforge.event.ForgeEventFactory.onPostWorldTick(serverlevel);
this.f_129754_.m_7238_();
this.f_129754_.m_7238_();
+ perWorldTickTimes.computeIfAbsent(serverlevel.m_46472_(), k -> new long[100])[this.f_129766_ % 100] = Util.m_137569_() - tickStart;
}
this.f_129754_.m_6182_("connection");
this.m_129919_().m_9721_();
this.f_129754_.m_6182_("players");
this.f_129763_.m_11288_();
- if (SharedConstants.f_136183_) {
+ if (net.minecraftforge.gametest.ForgeGameTestHooks.isGametestEnabled()) {
GameTestTicker.f_177648_.m_127790_();
}
@@ -966,7 +_,7 @@
@DontObfuscate
public String m_130001_() {
- return "vanilla";
+ return net.minecraftforge.internal.BrandingControl.getServerBranding();
}
public SystemReport m_177935_(SystemReport p_177936_) {
@@ -982,6 +_,7 @@
p_177936_.m_143522_("Data Packs", () -> {
StringBuilder stringbuilder = new StringBuilder();
+ //TODO-PATCHING:Figure out how to stop the logger here.
for(Pack pack : this.f_129730_.m_10524_()) {
if (stringbuilder.length() > 0) {
stringbuilder.append(", ");
@@ -1316,6 +_,7 @@
this.m_6846_().m_11315_();
this.f_129734_.m_136120_(this.f_129740_.f_206585_.m_206860_());
this.f_129741_.m_74335_(this.f_129740_.f_206584_);
+ this.m_6846_().m_11314_().forEach(this.m_6846_()::m_11289_); //Forge: Fix newly added/modified commands not being sent to the client when commands reload.
}, this);
if (this.m_18695_()) {
this.m_18701_(completablefuture::isDone);
@@ -1325,10 +_,13 @@
}
public static DataPackConfig m_129819_(PackRepository p_129820_, DataPackConfig p_129821_, boolean p_129822_) {
+ net.minecraftforge.resource.ResourcePackLoader.loadResourcePacks(p_129820_, net.minecraftforge.server.ServerLifecycleHooks::buildPackFinder);
p_129820_.m_10506_();
+ DataPackConfig.f_45842_.addModPacks(net.minecraftforge.common.ForgeHooks.getModPacks());
+ p_129821_.addModPacks(net.minecraftforge.common.ForgeHooks.getModPacks());
if (p_129822_) {
- p_129820_.m_10509_(Collections.singleton("vanilla"));
- return new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of());
+ p_129820_.m_10509_(net.minecraftforge.common.ForgeHooks.getModPacksWithVanilla());
+ return new DataPackConfig(net.minecraftforge.common.ForgeHooks.getModPacksWithVanilla(), ImmutableList.of());
} else {
Set<String> set = Sets.newLinkedHashSet();
@@ -1479,6 +_,31 @@
public abstract boolean m_7779_(GameProfile p_129840_);
+ private Map<ResourceKey<Level>, long[]> perWorldTickTimes = Maps.newIdentityHashMap();
+ @Nullable
+ public long[] getTickTime(ResourceKey<Level> 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<ResourceKey<Level>, ServerLevel> forgeGetWorldMap() {
+ return this.f_129762_;
+ }
+ private int worldArrayMarker = 0;
+ private int worldArrayLast = -1;
+ private ServerLevel[] worldArray;
+ @Deprecated //Forge Internal use Only, use to protect against concurrent modifications in the world tick loop.
+ public synchronized void markWorldsDirty() {
+ worldArrayMarker++;
+ }
+ private ServerLevel[] getWorldArray() {
+ if (worldArrayMarker == worldArrayLast && worldArray != null)
+ return worldArray;
+ worldArray = this.f_129762_.values().stream().toArray(x -> new ServerLevel[x]);
+ worldArrayLast = worldArrayMarker;
+ return worldArray;
+ }
+
public void m_142116_(Path p_177911_) throws IOException {
}
@@ -1732,6 +_,10 @@
public WorldData m_129910_() {
return this.f_129749_;
+ }
+
+ public MinecraftServer.ReloadableResources getServerResources() {
+ return f_129740_;
}
public RegistryAccess.Frozen m_206579_() {