Upstream/Folia
1
0
Fork 0
mirror of https://github.com/PaperMC/Folia.git synced 2024-11-21 11:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update patch for Paper

Browse Source
This commit is contained in:
Kyle Wood 2021-06-13 15:47:02 -05:00
parent 7a5fcc1249
commit 192618885a
No known key found for this signature in database
GPG Key ID: 86AF5613ACA30CC5
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0001-Build-changes.patch
View File

@ -27,28 +27,10 @@ index f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd..8a13deacc6d70ae1555f1cc8dedd1b7c
providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
).get().asFile
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cf92c3275869e4a0209fd4b07ad723e11717dc86..9846c65bbd77e5e30dcb93a90cdd961e58244ba2 100644
index 494a3afaaa0e3496d30e8d97edbab62b21610dfe..180ae99b7ec18b701e1eb92cfdefec20b6ba926f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -459,7 +459,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getProperties();
worldsettings = new LevelSettings(dedicatedserverproperties.levelName, dedicatedserverproperties.gamemode, dedicatedserverproperties.hardcore, dedicatedserverproperties.difficulty, false, new GameRules(), this.datapackconfiguration);
- generatorsettings = this.options.has("bonusChest") ? dedicatedserverproperties.worldGenSettings.withBonusChest() : dedicatedserverproperties.worldGenSettings;
+ generatorsettings = this.options.has("bonusChest") ? dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension).withBonusChest() : dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension);
}
overworldData = new PrimaryLevelData(worldsettings, generatorsettings, Lifecycle.stable());
@@ -548,7 +548,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getProperties();
worldsettings = new LevelSettings(dedicatedserverproperties.levelName, dedicatedserverproperties.gamemode, dedicatedserverproperties.hardcore, dedicatedserverproperties.difficulty, false, new GameRules(), this.datapackconfiguration);
- generatorsettings = this.options.has("bonusChest") ? dedicatedserverproperties.worldGenSettings.withBonusChest() : dedicatedserverproperties.worldGenSettings;
+ generatorsettings = this.options.has("bonusChest") ? dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension).withBonusChest() : dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension);
}
worlddata = new PrimaryLevelData(worldsettings, generatorsettings, Lifecycle.stable());
@@ -1511,7 +1511,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1538,7 +1538,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@ -58,7 +40,7 @@ index cf92c3275869e4a0209fd4b07ad723e11717dc86..9846c65bbd77e5e30dcb93a90cdd961e
public SystemReport fillSystemReport(SystemReport systemreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3452fc8ccddd5e9c8c12d98f55473fb2e322859a..58098f30f94e27112e23b4873bbd112a3dc8b546 100644
index 9730c701b734eb3491bc1fa5d9bb81ddfefc910a..88cb6103d328598e34ec569e39f6ab58bb74d373 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper