mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
344d299d69
While Velocity supports BungeeCord-style IP forwarding, it is not secure. Users have a lot of problems setting up firewalls or setting up plugins like IPWhitelist. Further, the BungeeCord IP forwarding protocol still retains essentially its original form, when there is brand new support for custom login plugin messages in 1.13. Velocity's modern IP forwarding uses an HMAC-SHA256 code to ensure authenticity of messages, is packed into a binary format that is smaller than BungeeCord's forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet.
222 lines
No EOL
11 KiB
Diff
222 lines
No EOL
11 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 29 Jul 2018 15:48:50 -0400
|
|
Subject: [PATCH] Provide option to use a versioned world folder for testing
|
|
|
|
This should not ever be used in production!!
|
|
|
|
This setting is intended for testing so you can try out converting your world
|
|
without actually modifying the world files.
|
|
|
|
This will add some additional overhead to your world, but you're
|
|
just testing anyways so that's not a big deal :)
|
|
|
|
Will store in a folder named after the current version.
|
|
|
|
PlayerData and Data folders are copied on server start, so there
|
|
may be some delay there, but region files are only copied on demand.
|
|
|
|
This is highly experiemental so backup your world before relying on this to not modify it
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
index f69a11ddf..c90148d8a 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -0,0 +0,0 @@ import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.logging.Level;
|
|
+import java.util.logging.Logger;
|
|
import java.util.regex.Pattern;
|
|
|
|
import com.google.common.collect.Lists;
|
|
@@ -0,0 +0,0 @@ public class PaperConfig {
|
|
Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs");
|
|
}
|
|
}
|
|
+
|
|
+ public static boolean useVersionedWorld = false;
|
|
+ private static void useVersionedWorld() {
|
|
+ useVersionedWorld = getBoolean("settings.use-versioned-world", false);
|
|
+ if (useVersionedWorld) {
|
|
+ Logger logger = Bukkit.getLogger();
|
|
+ String ver = MinecraftServer.getServer().getVersion();
|
|
+ logger.log(Level.INFO, "******************************************************");
|
|
+ logger.log(Level.INFO, "*** Using a versioned world folder. Your world will be saved");
|
|
+ logger.log(Level.INFO, "*** to into the " + ver + " folder, but copied from your current world.");
|
|
+ logger.log(Level.INFO, "*** ");
|
|
+ logger.log(Level.INFO, "*** This setting should not be used in your real world!!!");
|
|
+ logger.log(Level.INFO, "*** If you want to retain the new world, you need to move ");
|
|
+ logger.log(Level.INFO, "*** the folders out of the " + ver + " folder and overwrite existing");
|
|
+ logger.log(Level.INFO, "*** ");
|
|
+ logger.log(Level.INFO, "*** Deleting the " + ver + " folder will cause it to recreate again");
|
|
+ logger.log(Level.INFO, "*** from your unversioned world files.");
|
|
+ logger.log(Level.INFO, "*** ");
|
|
+ logger.log(Level.INFO, "*** You should backup your original world files incase something goes");
|
|
+ logger.log(Level.INFO, "*** wrong with this system! This is not a backup system.");
|
|
+ logger.log(Level.INFO, "******************************************************");
|
|
+ }
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
index db5c6e0f7..b6ec51837 100644
|
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
|
@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
|
private PersistentStructureLegacy e;
|
|
// private boolean f; // CraftBukkit
|
|
private static final double SAVE_QUEUE_TARGET_SIZE = 625; // Spigot
|
|
+ // Paper start - support saving to an alternate directory
|
|
+ private final File templateWorld;
|
|
+ private final File actualWorld;
|
|
+ private final boolean useAltWorld;
|
|
+
|
|
+ private void copyIfNeeded(int x, int z) {
|
|
+ if (!useAltWorld) {
|
|
+ return;
|
|
+ }
|
|
+ synchronized (RegionFileCache.class) {
|
|
+ if (RegionFileCache.hasRegionFile(this.actualWorld, x, z)) {
|
|
+ return;
|
|
+ }
|
|
+ File actual = RegionFileCache.getRegionFileName(this.actualWorld, x, z);
|
|
+ File template = RegionFileCache.getRegionFileName(this.templateWorld, x, z);
|
|
+ if (!actual.exists() && template.exists()) {
|
|
+ try {
|
|
+ //a.info("Copying" + template + " to " + actual);
|
|
+ java.nio.file.Files.copy(template.toPath(), actual.toPath(), java.nio.file.StandardCopyOption.COPY_ATTRIBUTES);
|
|
+ } catch (IOException e1) {
|
|
+ LogManager.getLogger().error("Error copying " + template + " to " + actual, e1);
|
|
+ MinecraftServer.getServer().safeShutdown();
|
|
+ org.spigotmc.SneakyThrow.sneaky(e1);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
|
|
public ChunkRegionLoader(File file, DataFixer datafixer) {
|
|
+ // Paper start
|
|
+ this.actualWorld = file;
|
|
+ if (com.destroystokyo.paper.PaperConfig.useVersionedWorld) {
|
|
+ this.useAltWorld = true;
|
|
+ String name = file.getName();
|
|
+ File container = file.getParentFile().getParentFile();
|
|
+ if (name.equals("DIM-1") || name.equals("DIM1")) {
|
|
+ container = container.getParentFile();
|
|
+ }
|
|
+ this.templateWorld = new File(container, name);
|
|
+ File region = new File(file, "region");
|
|
+ if (!region.exists()) {
|
|
+ region.mkdirs();
|
|
+ }
|
|
+ } else {
|
|
+ this.useAltWorld = false;
|
|
+ this.templateWorld = file;
|
|
+ }
|
|
+ // Paper end
|
|
this.c = file;
|
|
this.d = datafixer;
|
|
}
|
|
@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
|
}
|
|
|
|
public boolean chunkExists(int x, int z) {
|
|
- return RegionFileCache.chunkExists(this.c, x, z);
|
|
+ // Paper start
|
|
+ if (this.saveMap.containsKey(ChunkCoordIntPair.asLong(x, z))) {
|
|
+ return true;
|
|
+ }
|
|
+ copyIfNeeded(x, z);
|
|
+ return RegionFileCache.chunkExists(this.actualWorld, x, z);
|
|
+ // Paper end
|
|
}
|
|
|
|
@Nullable
|
|
private NBTTagCompound a(DimensionManager dimensionmanager, @Nullable PersistentCollection persistentcollection, int i, int j, @Nullable GeneratorAccess generatoraccess) throws IOException {
|
|
+ copyIfNeeded(i, j); // Paper
|
|
NBTTagCompound nbttagcompound = SupplierUtils.getIfExists(this.saveMap.get(ChunkCoordIntPair.asLong(i, j))); // Spigot // Paper
|
|
|
|
if (nbttagcompound != null) {
|
|
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
index 15666325e..3501b87f7 100644
|
|
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
|
|
@@ -0,0 +0,0 @@ public class RegionFileCache {
|
|
itr.remove();
|
|
}
|
|
}
|
|
+ public static synchronized File getRegionFileName(File file, int i, int j) {
|
|
+ File file1 = new File(file, "region");
|
|
+ return new File(file1, "r." + (i >> 5) + "." + (j >> 5) + ".mca");
|
|
+ }
|
|
+ public static synchronized boolean hasRegionFile(File file, int i, int j) {
|
|
+ return RegionFileCache.a.containsKey(getRegionFileName(file, i, j));
|
|
+ }
|
|
// Paper End
|
|
|
|
public static synchronized void a() {
|
|
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
|
index ab085788a..c84e6acdb 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
|
@@ -0,0 +0,0 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
|
|
|
|
public WorldNBTStorage(File file, String s, @Nullable MinecraftServer minecraftserver, DataFixer datafixer) {
|
|
this.a = datafixer;
|
|
+ // Paper start
|
|
+ if (com.destroystokyo.paper.PaperConfig.useVersionedWorld) {
|
|
+ File origBaseDir = new File(file, s);
|
|
+ final String currentVersion = MinecraftServer.getServer().getVersion();
|
|
+ file = new File(file, currentVersion);
|
|
+ File baseDir = new File(file, s);
|
|
+
|
|
+ if (!baseDir.exists() && origBaseDir.exists() && !baseDir.mkdirs()) {
|
|
+ LogManager.getLogger().error("Could not create world directory for " + file);
|
|
+ System.exit(1);
|
|
+ }
|
|
+
|
|
+ try {
|
|
+ boolean printedHeader = false;
|
|
+ String[] dirs = {"advancements", "data", "datapacks", "playerdata", "stats"};
|
|
+ for (String dir : dirs) {
|
|
+ File origPlayerData = new File(origBaseDir, dir);
|
|
+ File targetPlayerData = new File(baseDir, dir);
|
|
+ if (origPlayerData.exists() && !targetPlayerData.exists()) {
|
|
+ if (!printedHeader) {
|
|
+ LogManager.getLogger().info("**** VERSIONED WORLD - Copying files");
|
|
+ printedHeader = true;
|
|
+ }
|
|
+ LogManager.getLogger().info("- Copying: " + dir);
|
|
+ org.apache.commons.io.FileUtils.copyDirectory(origPlayerData, targetPlayerData);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ String[] files = {"level.dat", "level.dat_old", "session.lock", "uid.dat"};
|
|
+ for (String fileName : files) {
|
|
+ File origPlayerData = new File(origBaseDir, fileName);
|
|
+ File targetPlayerData = new File(baseDir, fileName);
|
|
+ if (origPlayerData.exists() && !targetPlayerData.exists()) {
|
|
+ if (!printedHeader) {
|
|
+ LogManager.getLogger().info("- Copying files");
|
|
+ printedHeader = true;
|
|
+ }
|
|
+ LogManager.getLogger().info("- Copying: " + fileName);
|
|
+ org.apache.commons.io.FileUtils.copyFile(origPlayerData, targetPlayerData);
|
|
+
|
|
+ }
|
|
+ }
|
|
+ if (printedHeader) {
|
|
+ LogManager.getLogger().info("**** VERSIONED WORLD - Copying DONE");
|
|
+ }
|
|
+ } catch (IOException e) {
|
|
+ LogManager.getLogger().error("Error copying versioned world data for " + origBaseDir + " to " + baseDir, e);
|
|
+ org.spigotmc.SneakyThrow.sneaky(e);
|
|
+ }
|
|
+
|
|
+ }
|
|
+ // Paper end
|
|
this.baseDir = new File(file, s);
|
|
this.baseDir.mkdirs();
|
|
this.playerDir = new File(this.baseDir, "playerdata");
|
|
--
|