761 lines
38 KiB
Diff
761 lines
38 KiB
Diff
--- a/net/minecraft/server/MinecraftServer.java
|
|
+++ b/net/minecraft/server/MinecraftServer.java
|
|
@@ -165,6 +165,32 @@
|
|
import net.minecraft.world.phys.Vec3D;
|
|
import org.slf4j.Logger;
|
|
|
|
+// CraftBukkit start
|
|
+import com.mojang.datafixers.util.Pair;
|
|
+import com.mojang.serialization.DynamicOps;
|
|
+import com.mojang.serialization.Lifecycle;
|
|
+import java.util.Random;
|
|
+import jline.console.ConsoleReader;
|
|
+import joptsimple.OptionSet;
|
|
+import net.minecraft.core.HolderLookup;
|
|
+import net.minecraft.nbt.DynamicOpsNBT;
|
|
+import net.minecraft.nbt.NBTBase;
|
|
+import net.minecraft.resources.RegistryOps;
|
|
+import net.minecraft.server.dedicated.DedicatedServer;
|
|
+import net.minecraft.server.dedicated.DedicatedServerProperties;
|
|
+import net.minecraft.util.datafix.DataConverterRegistry;
|
|
+import net.minecraft.world.level.levelgen.WorldDimensions;
|
|
+import net.minecraft.world.level.levelgen.presets.WorldPresets;
|
|
+import net.minecraft.world.level.storage.WorldDataServer;
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.craftbukkit.CraftServer;
|
|
+import org.bukkit.craftbukkit.Main;
|
|
+import org.bukkit.craftbukkit.util.CraftChatMessage;
|
|
+import org.bukkit.craftbukkit.util.LazyPlayerSet;
|
|
+import org.bukkit.event.player.AsyncPlayerChatPreviewEvent;
|
|
+import org.bukkit.event.server.ServerLoadEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements ICommandListener, AutoCloseable {
|
|
|
|
public static final Logger LOGGER = LogUtils.getLogger();
|
|
@@ -250,6 +276,20 @@
|
|
protected SaveData worldData;
|
|
private volatile boolean isSaving;
|
|
|
|
+ // CraftBukkit start
|
|
+ public final WorldLoader.a worldLoader;
|
|
+ public org.bukkit.craftbukkit.CraftServer server;
|
|
+ public OptionSet options;
|
|
+ public org.bukkit.command.ConsoleCommandSender console;
|
|
+ public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
|
|
+ public ConsoleReader reader;
|
|
+ public static int currentTick = (int) (System.currentTimeMillis() / 50);
|
|
+ public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
|
|
+ public int autosavePeriod;
|
|
+ public CommandDispatcher vanillaCommandDispatcher;
|
|
+ private boolean forceTicks;
|
|
+ // CraftBukkit end
|
|
+
|
|
public static <S extends MinecraftServer> S spin(Function<Thread, S> function) {
|
|
AtomicReference<S> atomicreference = new AtomicReference();
|
|
Thread thread = new Thread(() -> {
|
|
@@ -263,14 +303,14 @@
|
|
thread.setPriority(8);
|
|
}
|
|
|
|
- S s0 = (MinecraftServer) function.apply(thread);
|
|
+ S s0 = function.apply(thread); // CraftBukkit - decompile error
|
|
|
|
atomicreference.set(s0);
|
|
thread.start();
|
|
return s0;
|
|
}
|
|
|
|
- public MinecraftServer(Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, WorldLoadListenerFactory worldloadlistenerfactory) {
|
|
+ public MinecraftServer(OptionSet options, WorldLoader.a worldLoader, Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, WorldLoadListenerFactory worldloadlistenerfactory) {
|
|
super("Server");
|
|
this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
|
|
this.profiler = this.metricsRecorder.getProfiler();
|
|
@@ -290,7 +330,7 @@
|
|
this.frameTimer = new CircularTimer();
|
|
this.registries = worldstem.registries();
|
|
this.worldData = worldstem.worldData();
|
|
- if (!this.registries.compositeAccess().registryOrThrow(Registries.LEVEL_STEM).containsKey(WorldDimension.OVERWORLD)) {
|
|
+ if (false && !this.registries.compositeAccess().registryOrThrow(Registries.LEVEL_STEM).containsKey(WorldDimension.OVERWORLD)) { // CraftBukkit - initialised later
|
|
throw new IllegalStateException("Missing Overworld dimension data");
|
|
} else {
|
|
this.proxy = proxy;
|
|
@@ -313,13 +353,40 @@
|
|
this.serverThread = thread;
|
|
this.executor = SystemUtils.backgroundExecutor();
|
|
}
|
|
+ // CraftBukkit start
|
|
+ this.options = options;
|
|
+ this.worldLoader = worldLoader;
|
|
+ this.vanillaCommandDispatcher = worldstem.dataPackResources().commands; // CraftBukkit
|
|
+ // Try to see if we're actually running in a terminal, disable jline if not
|
|
+ if (System.console() == null && System.getProperty("jline.terminal") == null) {
|
|
+ System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
|
|
+ Main.useJline = false;
|
|
+ }
|
|
+
|
|
+ try {
|
|
+ reader = new ConsoleReader(System.in, System.out);
|
|
+ reader.setExpandEvents(false); // Avoid parsing exceptions for uncommonly used event designators
|
|
+ } catch (Throwable e) {
|
|
+ try {
|
|
+ // Try again with jline disabled for Windows users without C++ 2008 Redistributable
|
|
+ System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
|
|
+ System.setProperty("user.language", "en");
|
|
+ Main.useJline = false;
|
|
+ reader = new ConsoleReader(System.in, System.out);
|
|
+ reader.setExpandEvents(false);
|
|
+ } catch (IOException ex) {
|
|
+ LOGGER.warn((String) null, ex);
|
|
+ }
|
|
+ }
|
|
+ Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
|
|
}
|
|
+ // CraftBukkit end
|
|
|
|
private void readScoreboard(WorldPersistentData worldpersistentdata) {
|
|
ScoreboardServer scoreboardserver = this.getScoreboard();
|
|
|
|
Objects.requireNonNull(scoreboardserver);
|
|
- Function function = scoreboardserver::createData;
|
|
+ Function<net.minecraft.nbt.NBTTagCompound, net.minecraft.world.scores.PersistentScoreboard> function = scoreboardserver::createData; // CraftBukkit - decompile error
|
|
ScoreboardServer scoreboardserver1 = this.getScoreboard();
|
|
|
|
Objects.requireNonNull(scoreboardserver1);
|
|
@@ -328,7 +395,7 @@
|
|
|
|
protected abstract boolean initServer() throws IOException;
|
|
|
|
- protected void loadLevel() {
|
|
+ protected void loadLevel(String s) { // CraftBukkit
|
|
if (!JvmProfiler.INSTANCE.isRunning()) {
|
|
;
|
|
}
|
|
@@ -336,12 +403,8 @@
|
|
boolean flag = false;
|
|
ProfiledDuration profiledduration = JvmProfiler.INSTANCE.onWorldLoadedStarted();
|
|
|
|
- this.worldData.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
|
|
- WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
|
|
+ loadWorld0(s); // CraftBukkit
|
|
|
|
- this.createLevels(worldloadlistener);
|
|
- this.forceDifficulty();
|
|
- this.prepareLevels(worldloadlistener);
|
|
if (profiledduration != null) {
|
|
profiledduration.finish();
|
|
}
|
|
@@ -356,25 +419,183 @@
|
|
|
|
}
|
|
|
|
- protected void forceDifficulty() {}
|
|
+ // CraftBukkit start
|
|
+ private void loadWorld0(String s) {
|
|
+ Convertable.ConversionSession worldSession = this.storageSource;
|
|
+
|
|
+ IRegistry<WorldDimension> dimensions = this.registries.compositeAccess().registryOrThrow(Registries.LEVEL_STEM);
|
|
+ for (WorldDimension worldDimension : dimensions) {
|
|
+ ResourceKey<WorldDimension> dimensionKey = dimensions.getResourceKey(worldDimension).get();
|
|
+
|
|
+ WorldServer world;
|
|
+ int dimension = 0;
|
|
+
|
|
+ if (dimensionKey == WorldDimension.NETHER) {
|
|
+ if (isNetherEnabled()) {
|
|
+ dimension = -1;
|
|
+ } else {
|
|
+ continue;
|
|
+ }
|
|
+ } else if (dimensionKey == WorldDimension.END) {
|
|
+ if (server.getAllowEnd()) {
|
|
+ dimension = 1;
|
|
+ } else {
|
|
+ continue;
|
|
+ }
|
|
+ } else if (dimensionKey != WorldDimension.OVERWORLD) {
|
|
+ dimension = -999;
|
|
+ }
|
|
|
|
- protected void createLevels(WorldLoadListener worldloadlistener) {
|
|
- IWorldDataServer iworlddataserver = this.worldData.overworldData();
|
|
- boolean flag = this.worldData.isDebugWorld();
|
|
- IRegistry<WorldDimension> iregistry = this.registries.compositeAccess().registryOrThrow(Registries.LEVEL_STEM);
|
|
- WorldOptions worldoptions = this.worldData.worldGenOptions();
|
|
- long i = worldoptions.seed();
|
|
- long j = BiomeManager.obfuscateSeed(i);
|
|
- List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(iworlddataserver));
|
|
- WorldDimension worlddimension = (WorldDimension) iregistry.get(WorldDimension.OVERWORLD);
|
|
- WorldServer worldserver = new WorldServer(this, this.executor, this.storageSource, iworlddataserver, World.OVERWORLD, worlddimension, worldloadlistener, flag, j, list, true);
|
|
+ String worldType = (dimension == -999) ? dimensionKey.location().getNamespace() + "_" + dimensionKey.location().getPath() : org.bukkit.World.Environment.getEnvironment(dimension).toString().toLowerCase();
|
|
+ String name = (dimensionKey == WorldDimension.OVERWORLD) ? s : s + "_" + worldType;
|
|
+ if (dimension != 0) {
|
|
+ File newWorld = Convertable.getStorageFolder(new File(name).toPath(), dimensionKey).toFile();
|
|
+ File oldWorld = Convertable.getStorageFolder(new File(s).toPath(), dimensionKey).toFile();
|
|
+ File oldLevelDat = new File(new File(s), "level.dat"); // The data folders exist on first run as they are created in the PersistentCollection constructor above, but the level.dat won't
|
|
+
|
|
+ if (!newWorld.isDirectory() && oldWorld.isDirectory() && oldLevelDat.isFile()) {
|
|
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder required ----");
|
|
+ MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, Bukkit requires that you move your " + worldType + " folder to a new location in order to operate correctly.");
|
|
+ MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using Bukkit in the future.");
|
|
+ MinecraftServer.LOGGER.info("Attempting to move " + oldWorld + " to " + newWorld + "...");
|
|
+
|
|
+ if (newWorld.exists()) {
|
|
+ MinecraftServer.LOGGER.warn("A file or folder already exists at " + newWorld + "!");
|
|
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder failed ----");
|
|
+ } else if (newWorld.getParentFile().mkdirs()) {
|
|
+ if (oldWorld.renameTo(newWorld)) {
|
|
+ MinecraftServer.LOGGER.info("Success! To restore " + worldType + " in the future, simply move " + newWorld + " to " + oldWorld);
|
|
+ // Migrate world data too.
|
|
+ try {
|
|
+ com.google.common.io.Files.copy(oldLevelDat, new File(new File(name), "level.dat"));
|
|
+ org.apache.commons.io.FileUtils.copyDirectory(new File(new File(s), "data"), new File(new File(name), "data"));
|
|
+ } catch (IOException exception) {
|
|
+ MinecraftServer.LOGGER.warn("Unable to migrate world data.");
|
|
+ }
|
|
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder complete ----");
|
|
+ } else {
|
|
+ MinecraftServer.LOGGER.warn("Could not move folder " + oldWorld + " to " + newWorld + "!");
|
|
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder failed ----");
|
|
+ }
|
|
+ } else {
|
|
+ MinecraftServer.LOGGER.warn("Could not create path for " + newWorld + "!");
|
|
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder failed ----");
|
|
+ }
|
|
+ }
|
|
+
|
|
+ try {
|
|
+ worldSession = Convertable.createDefault(server.getWorldContainer().toPath()).createAccess(name, dimensionKey);
|
|
+ } catch (IOException ex) {
|
|
+ throw new RuntimeException(ex);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name);
|
|
+ org.bukkit.generator.BiomeProvider biomeProvider = this.server.getBiomeProvider(name);
|
|
+
|
|
+ WorldDataServer worlddata;
|
|
+ WorldLoader.a worldloader_a = this.worldLoader;
|
|
+ IRegistry<WorldDimension> iregistry = worldloader_a.datapackDimensions().registryOrThrow(Registries.LEVEL_STEM);
|
|
+ DynamicOps<NBTBase> dynamicops = RegistryOps.create(DynamicOpsNBT.INSTANCE, (HolderLookup.b) worldloader_a.datapackWorldgen());
|
|
+ Pair<SaveData, WorldDimensions.b> pair = worldSession.getDataTag(dynamicops, worldloader_a.dataConfiguration(), iregistry, worldloader_a.datapackWorldgen().allRegistriesLifecycle());
|
|
+
|
|
+ if (pair != null) {
|
|
+ worlddata = (WorldDataServer) pair.getFirst();
|
|
+ } else {
|
|
+ WorldSettings worldsettings;
|
|
+ WorldOptions worldoptions;
|
|
+ WorldDimensions worlddimensions;
|
|
+
|
|
+ if (this.isDemo()) {
|
|
+ worldsettings = MinecraftServer.DEMO_SETTINGS;
|
|
+ worldoptions = WorldOptions.DEMO_OPTIONS;
|
|
+ worlddimensions = WorldPresets.createNormalWorldDimensions(worldloader_a.datapackWorldgen());
|
|
+ } else {
|
|
+ DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getProperties();
|
|
+
|
|
+ worldsettings = new WorldSettings(dedicatedserverproperties.levelName, dedicatedserverproperties.gamemode, dedicatedserverproperties.hardcore, dedicatedserverproperties.difficulty, false, new GameRules(), worldloader_a.dataConfiguration());
|
|
+ worldoptions = options.has("bonusChest") ? dedicatedserverproperties.worldOptions.withBonusChest(true) : dedicatedserverproperties.worldOptions;
|
|
+ worlddimensions = dedicatedserverproperties.createDimensions(worldloader_a.datapackWorldgen());
|
|
+ }
|
|
+
|
|
+ WorldDimensions.b worlddimensions_b = worlddimensions.bake(iregistry);
|
|
+ Lifecycle lifecycle = worlddimensions_b.lifecycle().add(worldloader_a.datapackWorldgen().allRegistriesLifecycle());
|
|
+
|
|
+ worlddata = new WorldDataServer(worldsettings, worldoptions, worlddimensions_b.specialWorldProperty(), lifecycle);
|
|
+ }
|
|
+ worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
|
|
+ if (options.has("forceUpgrade")) {
|
|
+ net.minecraft.server.Main.forceUpgrade(worldSession, DataConverterRegistry.getDataFixer(), options.has("eraseCache"), () -> {
|
|
+ return true;
|
|
+ }, iregistry);
|
|
+ }
|
|
+
|
|
+ WorldDataServer iworlddataserver = worlddata;
|
|
+ boolean flag = worlddata.isDebugWorld();
|
|
+ WorldOptions worldoptions = worlddata.worldGenOptions();
|
|
+ long i = worldoptions.seed();
|
|
+ long j = BiomeManager.obfuscateSeed(i);
|
|
+ List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(iworlddataserver));
|
|
+ WorldDimension worlddimension = (WorldDimension) dimensions.get(dimensionKey);
|
|
+
|
|
+ org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.type().value());
|
|
+ if (biomeProvider == null && gen != null) {
|
|
+ biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
|
|
+ }
|
|
+
|
|
+ ResourceKey<World> worldKey = ResourceKey.create(Registries.DIMENSION, dimensionKey.location());
|
|
+
|
|
+ if (dimensionKey == WorldDimension.OVERWORLD) {
|
|
+ this.worldData = worlddata;
|
|
+ this.worldData.setGameType(((DedicatedServer) this).getProperties().gamemode); // From DedicatedServer.init
|
|
|
|
- this.levels.put(World.OVERWORLD, worldserver);
|
|
- WorldPersistentData worldpersistentdata = worldserver.getDataStorage();
|
|
+ WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
|
|
|
|
- this.readScoreboard(worldpersistentdata);
|
|
- this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
|
|
+ world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, list, true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
|
|
+ WorldPersistentData worldpersistentdata = world.getDataStorage();
|
|
+ this.readScoreboard(worldpersistentdata);
|
|
+ this.server.scoreboardManager = new org.bukkit.craftbukkit.scoreboard.CraftScoreboardManager(this, world.getScoreboard());
|
|
+ this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
|
|
+ } else {
|
|
+ WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
|
|
+ world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, ImmutableList.of(), true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
|
|
+ }
|
|
+
|
|
+ worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
|
|
+ this.initWorld(world, worlddata, worldData, worldoptions);
|
|
+
|
|
+ this.addLevel(world);
|
|
+ this.getPlayerList().addWorldborderListener(world);
|
|
+
|
|
+ if (worlddata.getCustomBossEvents() != null) {
|
|
+ this.getCustomBossEvents().load(worlddata.getCustomBossEvents());
|
|
+ }
|
|
+ }
|
|
+ this.forceDifficulty();
|
|
+ for (WorldServer worldserver : this.getAllLevels()) {
|
|
+ this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
|
|
+ worldserver.entityManager.tick(); // SPIGOT-6526: Load pending entities so they are available to the API
|
|
+ this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
|
|
+ }
|
|
+
|
|
+ this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
|
|
+ this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
|
|
+ this.connection.acceptConnections();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
+ protected void forceDifficulty() {}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ public void initWorld(WorldServer worldserver, IWorldDataServer iworlddataserver, SaveData saveData, WorldOptions worldoptions) {
|
|
+ boolean flag = saveData.isDebugWorld();
|
|
+ // CraftBukkit start
|
|
+ if (worldserver.generator != null) {
|
|
+ worldserver.getWorld().getPopulators().addAll(worldserver.generator.getDefaultPopulators(worldserver.getWorld()));
|
|
+ }
|
|
WorldBorder worldborder = worldserver.getWorldBorder();
|
|
+ worldborder.applySettings(iworlddataserver.getWorldBorder()); // CraftBukkit - move up so that WorldBorder is set during WorldInitEvent
|
|
+ this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldInitEvent(worldserver.getWorld())); // CraftBukkit - SPIGOT-5569: Call WorldInitEvent before any chunks are generated
|
|
|
|
if (!iworlddataserver.isInitialized()) {
|
|
try {
|
|
@@ -398,29 +619,8 @@
|
|
iworlddataserver.setInitialized(true);
|
|
}
|
|
|
|
- this.getPlayerList().addWorldborderListener(worldserver);
|
|
- if (this.worldData.getCustomBossEvents() != null) {
|
|
- this.getCustomBossEvents().load(this.worldData.getCustomBossEvents());
|
|
- }
|
|
-
|
|
- Iterator iterator = iregistry.entrySet().iterator();
|
|
-
|
|
- while (iterator.hasNext()) {
|
|
- Entry<ResourceKey<WorldDimension>, WorldDimension> entry = (Entry) iterator.next();
|
|
- ResourceKey<WorldDimension> resourcekey = (ResourceKey) entry.getKey();
|
|
-
|
|
- if (resourcekey != WorldDimension.OVERWORLD) {
|
|
- ResourceKey<World> resourcekey1 = ResourceKey.create(Registries.DIMENSION, resourcekey.location());
|
|
- SecondaryWorldData secondaryworlddata = new SecondaryWorldData(this.worldData, iworlddataserver);
|
|
- WorldServer worldserver1 = new WorldServer(this, this.executor, this.storageSource, secondaryworlddata, resourcekey1, (WorldDimension) entry.getValue(), worldloadlistener, flag, j, ImmutableList.of(), false);
|
|
-
|
|
- worldborder.addListener(new IWorldBorderListener.a(worldserver1.getWorldBorder()));
|
|
- this.levels.put(resourcekey1, worldserver1);
|
|
- }
|
|
- }
|
|
-
|
|
- worldborder.applySettings(iworlddataserver.getWorldBorder());
|
|
}
|
|
+ // CraftBukkit end
|
|
|
|
private static void setInitialSpawn(WorldServer worldserver, IWorldDataServer iworlddataserver, boolean flag, boolean flag1) {
|
|
if (flag1) {
|
|
@@ -428,6 +628,21 @@
|
|
} else {
|
|
ChunkProviderServer chunkproviderserver = worldserver.getChunkSource();
|
|
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(chunkproviderserver.randomState().sampler().findSpawnPosition());
|
|
+ // CraftBukkit start
|
|
+ if (worldserver.generator != null) {
|
|
+ Random rand = new Random(worldserver.getSeed());
|
|
+ org.bukkit.Location spawn = worldserver.generator.getFixedSpawnLocation(worldserver.getWorld(), rand);
|
|
+
|
|
+ if (spawn != null) {
|
|
+ if (spawn.getWorld() != worldserver.getWorld()) {
|
|
+ throw new IllegalStateException("Cannot set spawn point for " + iworlddataserver.getLevelName() + " to be in another world (" + spawn.getWorld().getName() + ")");
|
|
+ } else {
|
|
+ iworlddataserver.setSpawn(new BlockPosition(spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ()), spawn.getYaw());
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
int i = chunkproviderserver.getGenerator().getSpawnHeight(worldserver);
|
|
|
|
if (i < worldserver.getMinBuildHeight()) {
|
|
@@ -487,8 +702,11 @@
|
|
iworlddataserver.setGameType(EnumGamemode.SPECTATOR);
|
|
}
|
|
|
|
- public void prepareLevels(WorldLoadListener worldloadlistener) {
|
|
- WorldServer worldserver = this.overworld();
|
|
+ // CraftBukkit start
|
|
+ public void prepareLevels(WorldLoadListener worldloadlistener, WorldServer worldserver) {
|
|
+ // WorldServer worldserver = this.overworld();
|
|
+ this.forceTicks = true;
|
|
+ // CraftBukkit end
|
|
|
|
MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.dimension().location());
|
|
BlockPosition blockposition = worldserver.getSharedSpawnPos();
|
|
@@ -498,19 +716,23 @@
|
|
|
|
chunkproviderserver.getLightEngine().setTaskPerBatch(500);
|
|
this.nextTickTime = SystemUtils.getMillis();
|
|
- chunkproviderserver.addRegionTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 11, Unit.INSTANCE);
|
|
+ // CraftBukkit start
|
|
+ if (worldserver.getWorld().getKeepSpawnInMemory()) {
|
|
+ chunkproviderserver.addRegionTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 11, Unit.INSTANCE);
|
|
|
|
- while (chunkproviderserver.getTickingGenerated() != 441) {
|
|
- this.nextTickTime = SystemUtils.getMillis() + 10L;
|
|
- this.waitUntilNextTick();
|
|
+ while (chunkproviderserver.getTickingGenerated() != 441) {
|
|
+ // this.nextTickTime = SystemUtils.getMillis() + 10L;
|
|
+ this.executeModerately();
|
|
+ }
|
|
}
|
|
|
|
- this.nextTickTime = SystemUtils.getMillis() + 10L;
|
|
- this.waitUntilNextTick();
|
|
- Iterator iterator = this.levels.values().iterator();
|
|
+ // this.nextTickTime = SystemUtils.getMillis() + 10L;
|
|
+ this.executeModerately();
|
|
+ // Iterator iterator = this.levels.values().iterator();
|
|
|
|
- while (iterator.hasNext()) {
|
|
- WorldServer worldserver1 = (WorldServer) iterator.next();
|
|
+ if (true) {
|
|
+ WorldServer worldserver1 = worldserver;
|
|
+ // CraftBukkit end
|
|
ForcedChunk forcedchunk = (ForcedChunk) worldserver1.getDataStorage().get(ForcedChunk::load, "chunks");
|
|
|
|
if (forcedchunk != null) {
|
|
@@ -525,11 +747,18 @@
|
|
}
|
|
}
|
|
|
|
- this.nextTickTime = SystemUtils.getMillis() + 10L;
|
|
- this.waitUntilNextTick();
|
|
+ // CraftBukkit start
|
|
+ // this.nextTickTime = SystemUtils.getMillis() + 10L;
|
|
+ this.executeModerately();
|
|
+ // CraftBukkit end
|
|
worldloadlistener.stop();
|
|
chunkproviderserver.getLightEngine().setTaskPerBatch(5);
|
|
- this.updateMobSpawningFlags();
|
|
+ // CraftBukkit start
|
|
+ // this.updateMobSpawningFlags();
|
|
+ worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
|
|
+
|
|
+ this.forceTicks = false;
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public EnumGamemode getDefaultGameType() {
|
|
@@ -559,12 +788,16 @@
|
|
worldserver.save((IProgressUpdate) null, flag1, worldserver.noSave && !flag2);
|
|
}
|
|
|
|
+ // CraftBukkit start - moved to WorldServer.save
|
|
+ /*
|
|
WorldServer worldserver1 = this.overworld();
|
|
IWorldDataServer iworlddataserver = this.worldData.overworldData();
|
|
|
|
iworlddataserver.setWorldBorder(worldserver1.getWorldBorder().createSettings());
|
|
this.worldData.setCustomBossEvents(this.getCustomBossEvents().save());
|
|
this.storageSource.saveDataTag(this.registryAccess(), this.worldData, this.getPlayerList().getSingleplayerData());
|
|
+ */
|
|
+ // CraftBukkit end
|
|
if (flag1) {
|
|
Iterator iterator1 = this.getAllLevels().iterator();
|
|
|
|
@@ -599,12 +832,33 @@
|
|
this.stopServer();
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ private boolean hasStopped = false;
|
|
+ private final Object stopLock = new Object();
|
|
+ public final boolean hasStopped() {
|
|
+ synchronized (stopLock) {
|
|
+ return hasStopped;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public void stopServer() {
|
|
+ // CraftBukkit start - prevent double stopping on multiple threads
|
|
+ synchronized(stopLock) {
|
|
+ if (hasStopped) return;
|
|
+ hasStopped = true;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (this.metricsRecorder.isRecording()) {
|
|
this.cancelRecordingMetrics();
|
|
}
|
|
|
|
MinecraftServer.LOGGER.info("Stopping server");
|
|
+ // CraftBukkit start
|
|
+ if (this.server != null) {
|
|
+ this.server.disablePlugins();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (this.getConnection() != null) {
|
|
this.getConnection().stop();
|
|
}
|
|
@@ -614,6 +868,7 @@
|
|
MinecraftServer.LOGGER.info("Saving players");
|
|
this.playerList.saveAll();
|
|
this.playerList.removeAll();
|
|
+ try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
|
|
}
|
|
|
|
MinecraftServer.LOGGER.info("Saving worlds");
|
|
@@ -701,15 +956,16 @@
|
|
}
|
|
|
|
this.nextTickTime = SystemUtils.getMillis();
|
|
- this.statusIcon = (ServerPing.a) this.loadStatusIcon().orElse((Object) null);
|
|
+ this.statusIcon = (ServerPing.a) this.loadStatusIcon().orElse(null); // CraftBukkit - decompile error
|
|
this.status = this.buildServerStatus();
|
|
|
|
while (this.running) {
|
|
long i = SystemUtils.getMillis() - this.nextTickTime;
|
|
|
|
- if (i > 2000L && this.nextTickTime - this.lastOverloadWarning >= 15000L) {
|
|
+ if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
|
|
long j = i / 50L;
|
|
|
|
+ if (server.getWarnOnOverload()) // CraftBukkit
|
|
MinecraftServer.LOGGER.warn("Can't keep up! Is the server overloaded? Running {}ms or {} ticks behind", i, j);
|
|
this.nextTickTime += j * 50L;
|
|
this.lastOverloadWarning = this.nextTickTime;
|
|
@@ -720,6 +976,7 @@
|
|
this.debugCommandProfiler = new MinecraftServer.TimeProfiler(SystemUtils.getNanos(), this.tickCount);
|
|
}
|
|
|
|
+ MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
|
|
this.nextTickTime += 50L;
|
|
this.startMetricsRecordingTick();
|
|
this.profiler.push("tick");
|
|
@@ -758,6 +1015,12 @@
|
|
this.services.profileCache().clearExecutor();
|
|
}
|
|
|
|
+ // CraftBukkit start - Restore terminal to original settings
|
|
+ try {
|
|
+ reader.getTerminal().restore();
|
|
+ } catch (Exception ignored) {
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.onServerExit();
|
|
}
|
|
|
|
@@ -791,9 +1054,16 @@
|
|
}
|
|
|
|
private boolean haveTime() {
|
|
- return this.runningTask() || SystemUtils.getMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
|
|
+ // CraftBukkit start
|
|
+ return this.forceTicks || this.runningTask() || SystemUtils.getMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
|
|
}
|
|
|
|
+ private void executeModerately() {
|
|
+ this.runAllTasks();
|
|
+ java.util.concurrent.locks.LockSupport.parkNanos("executing tasks", 1000L);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
protected void waitUntilNextTick() {
|
|
this.runAllTasks();
|
|
this.managedBlock(() -> {
|
|
@@ -838,7 +1108,7 @@
|
|
}
|
|
}
|
|
|
|
- protected void doRunTask(TickTask ticktask) {
|
|
+ public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
|
|
this.getProfiler().incrementCounter("runTask");
|
|
super.doRunTask(ticktask);
|
|
}
|
|
@@ -891,7 +1161,7 @@
|
|
this.status = this.buildServerStatus();
|
|
}
|
|
|
|
- if (this.tickCount % 6000 == 0) {
|
|
+ if (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0) { // CraftBukkit
|
|
MinecraftServer.LOGGER.debug("Autosave started");
|
|
this.profiler.push("save");
|
|
this.saveEverything(true, false, false);
|
|
@@ -938,22 +1208,39 @@
|
|
}
|
|
|
|
public void tickChildren(BooleanSupplier booleansupplier) {
|
|
+ this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
|
|
this.profiler.push("commandFunctions");
|
|
this.getFunctions().tick();
|
|
this.profiler.popPush("levels");
|
|
Iterator iterator = this.getAllLevels().iterator();
|
|
|
|
+ // CraftBukkit start
|
|
+ // Run tasks that are waiting on processing
|
|
+ while (!processQueue.isEmpty()) {
|
|
+ processQueue.remove().run();
|
|
+ }
|
|
+
|
|
+ // Send time updates to everyone, it will get the right time from the world the player is in.
|
|
+ if (this.tickCount % 20 == 0) {
|
|
+ for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
|
|
+ EntityPlayer entityplayer = (EntityPlayer) this.getPlayerList().players.get(i);
|
|
+ entityplayer.connection.send(new PacketPlayOutUpdateTime(entityplayer.level.getGameTime(), entityplayer.getPlayerTime(), entityplayer.level.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); // Add support for per player time
|
|
+ }
|
|
+ }
|
|
+
|
|
while (iterator.hasNext()) {
|
|
WorldServer worldserver = (WorldServer) iterator.next();
|
|
|
|
this.profiler.push(() -> {
|
|
return worldserver + " " + worldserver.dimension().location();
|
|
});
|
|
+ /* Drop global time updates
|
|
if (this.tickCount % 20 == 0) {
|
|
this.profiler.push("timeSync");
|
|
this.synchronizeTime(worldserver);
|
|
this.profiler.pop();
|
|
}
|
|
+ // CraftBukkit end */
|
|
|
|
this.profiler.push("tick");
|
|
|
|
@@ -1033,6 +1320,22 @@
|
|
return (WorldServer) this.levels.get(resourcekey);
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ public void addLevel(WorldServer level) {
|
|
+ Map<ResourceKey<World>, WorldServer> oldLevels = this.levels;
|
|
+ Map<ResourceKey<World>, WorldServer> newLevels = Maps.newLinkedHashMap(oldLevels);
|
|
+ newLevels.put(level.dimension(), level);
|
|
+ this.levels = Collections.unmodifiableMap(newLevels);
|
|
+ }
|
|
+
|
|
+ public void removeLevel(WorldServer level) {
|
|
+ Map<ResourceKey<World>, WorldServer> oldLevels = this.levels;
|
|
+ Map<ResourceKey<World>, WorldServer> newLevels = Maps.newLinkedHashMap(oldLevels);
|
|
+ newLevels.remove(level.dimension());
|
|
+ this.levels = Collections.unmodifiableMap(newLevels);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public Set<ResourceKey<World>> levelKeys() {
|
|
return this.levels.keySet();
|
|
}
|
|
@@ -1059,7 +1362,7 @@
|
|
|
|
@DontObfuscate
|
|
public String getServerModName() {
|
|
- return "vanilla";
|
|
+ return server.getName(); // CraftBukkit - cb > vanilla!
|
|
}
|
|
|
|
public SystemReport fillSystemReport(SystemReport systemreport) {
|
|
@@ -1398,11 +1701,11 @@
|
|
public CompletableFuture<Void> reloadResources(Collection<String> collection) {
|
|
IRegistryCustom.Dimension iregistrycustom_dimension = this.registries.getAccessForLoading(RegistryLayer.RELOADABLE);
|
|
CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
|
|
- Stream stream = collection.stream();
|
|
+ Stream<String> stream = collection.stream(); // CraftBukkit - decompile error
|
|
ResourcePackRepository resourcepackrepository = this.packRepository;
|
|
|
|
Objects.requireNonNull(this.packRepository);
|
|
- return (ImmutableList) stream.map(resourcepackrepository::getPack).filter(Objects::nonNull).map(ResourcePackLoader::open).collect(ImmutableList.toImmutableList());
|
|
+ return stream.map(resourcepackrepository::getPack).filter(Objects::nonNull).map(ResourcePackLoader::open).collect(ImmutableList.toImmutableList()); // CraftBukkit - decompile error
|
|
}, this).thenCompose((immutablelist) -> {
|
|
ResourceManager resourcemanager = new ResourceManager(EnumResourcePackType.SERVER_DATA, immutablelist);
|
|
|
|
@@ -1417,6 +1720,7 @@
|
|
}).thenAcceptAsync((minecraftserver_reloadableresources) -> {
|
|
this.resources.close();
|
|
this.resources = minecraftserver_reloadableresources;
|
|
+ this.server.syncCommands(); // SPIGOT-5884: Lost on reload
|
|
this.packRepository.setSelected(collection);
|
|
WorldDataConfiguration worlddataconfiguration = new WorldDataConfiguration(getSelectedPacks(this.packRepository), this.worldData.enabledFeatures());
|
|
|
|
@@ -1785,7 +2089,7 @@
|
|
try {
|
|
label51:
|
|
{
|
|
- ArrayList arraylist;
|
|
+ ArrayList<NativeModuleLister.a> arraylist; // CraftBukkit - decompile error
|
|
|
|
try {
|
|
arraylist = Lists.newArrayList(NativeModuleLister.listModules());
|
|
@@ -1835,6 +2139,22 @@
|
|
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ @Override
|
|
+ public boolean isSameThread() {
|
|
+ return super.isSameThread() || this.isStopped(); // CraftBukkit - MC-142590
|
|
+ }
|
|
+
|
|
+ public boolean isDebugging() {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ @Deprecated
|
|
+ public static MinecraftServer getServer() {
|
|
+ return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
private void startMetricsRecordingTick() {
|
|
if (this.willStartRecordingMetrics) {
|
|
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(SystemUtils.timeSource, this.isDedicatedServer()), SystemUtils.timeSource, SystemUtils.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
|
|
@@ -1961,8 +2281,30 @@
|
|
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ public final java.util.concurrent.ExecutorService chatExecutor = java.util.concurrent.Executors.newCachedThreadPool(
|
|
+ new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").build());
|
|
+
|
|
public ChatDecorator getChatDecorator() {
|
|
- return ChatDecorator.PLAIN;
|
|
+ return (entityplayer, ichatbasecomponent) -> {
|
|
+ // SPIGOT-7127: Console /say and similar
|
|
+ if (entityplayer == null) {
|
|
+ return CompletableFuture.completedFuture(ichatbasecomponent);
|
|
+ }
|
|
+
|
|
+ return CompletableFuture.supplyAsync(() -> {
|
|
+ AsyncPlayerChatPreviewEvent event = new AsyncPlayerChatPreviewEvent(true, entityplayer.getBukkitEntity(), CraftChatMessage.fromComponent(ichatbasecomponent), new LazyPlayerSet(this));
|
|
+ String originalFormat = event.getFormat(), originalMessage = event.getMessage();
|
|
+ this.server.getPluginManager().callEvent(event);
|
|
+
|
|
+ if (originalFormat.equals(event.getFormat()) && originalMessage.equals(event.getMessage()) && event.getPlayer().getName().equalsIgnoreCase(event.getPlayer().getDisplayName())) {
|
|
+ return ichatbasecomponent;
|
|
+ }
|
|
+
|
|
+ return CraftChatMessage.fromStringOrNull(String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage()));
|
|
+ }, chatExecutor);
|
|
+ };
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public static record ReloadableResources(IReloadableResourceManager resourceManager, DataPackResources managers) implements AutoCloseable {
|