Skip to content

Commit

Permalink
Update Paper
Browse files Browse the repository at this point in the history
  • Loading branch information
s-yh-china committed Jun 17, 2023
1 parent 3767806 commit 2710cdf
Show file tree
Hide file tree
Showing 7 changed files with 345 additions and 297 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT
mcVersion=1.20.1
packageVersion=1_20_R1
org.gradle.jvmargs=-Xmx2G
paperRef=2e363c73ba3c0a7b3d5138ec55a6e93c7befb5bb
paperRef=38856661c0f10f927b130bdc83c3cc6aafa5cb9a
preVersion=false
610 changes: 329 additions & 281 deletions patches/server/0001-Build-changes.patch

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions patches/server/0004-Leaves-Server-Config-And-Command.patch
Original file line number Diff line number Diff line change
Expand Up @@ -65,34 +65,34 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..4f0a2c9b352f5824ec0c30d0f0af0fe1
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 46bececa35aac65ba95aed49702a6bf8aa6789ec..a0b0c99587dc0e0ce804c0c7c2b4d0bcf2fb0c2e 100644
index c6be267357a26393e58d7f3a76a425922b8cfa0d..8bbd7539cbd70201bf75ad80cf199b99e5cbd47a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -979,6 +979,7 @@ public final class CraftServer implements Server {
@@ -983,6 +983,7 @@ public final class CraftServer implements Server {

org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
+ top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -994,6 +995,7 @@ public final class CraftServer implements Server {
@@ -998,6 +999,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
+ world.leavesConfig.init(); // Leaves - World Config
}

Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1009,6 +1011,7 @@ public final class CraftServer implements Server {
@@ -1013,6 +1015,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
+ top.leavesmc.leaves.LeavesConfig.registerCommands(); // Leaves - Server Command
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");

@@ -2775,6 +2778,14 @@ public final class CraftServer implements Server {
@@ -2779,6 +2782,14 @@ public final class CraftServer implements Server {
{
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0043-PCA-sync-protocol.patch
Original file line number Diff line number Diff line change
Expand Up @@ -343,18 +343,18 @@ index b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..25a9c38c60d183bb65b14f4d7550ab98
public int[] getSlotsForFace(Direction side) {
return ShulkerBoxBlockEntity.SLOTS;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a0b0c99587dc0e0ce804c0c7c2b4d0bcf2fb0c2e..27b36d302a3faf376a456afedac5d19ab2392811 100644
index 8bbd7539cbd70201bf75ad80cf199b99e5cbd47a..589ead0bc80f4b778fea790c0537003fb79518f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -388,6 +388,7 @@ public final class CraftServer implements Server {
@@ -392,6 +392,7 @@ public final class CraftServer implements Server {
MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
}
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
+ top.leavesmc.leaves.protocol.PcaSyncProtocol.init(); // Leaves - pca
}

public boolean getCommandBlockOverride(String command) {
@@ -980,6 +981,13 @@ public final class CraftServer implements Server {
@@ -984,6 +985,13 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0044-BBOR-Protocol.patch
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ index cc224af0139a6e3adefd22cbfa0cd519735b7191..2c3ca05644bc97d505e8ca92e7a5f486

public Level getLevel() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 27b36d302a3faf376a456afedac5d19ab2392811..0ad7ab0d8e760e9da1d59bfbbd9ed8b075a35116 100644
index 589ead0bc80f4b778fea790c0537003fb79518f1..89c6141f0568a30b92ec2ba94f635e675f0c61e2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -988,6 +988,13 @@ public final class CraftServer implements Server {
@@ -992,6 +992,13 @@ public final class CraftServer implements Server {
top.leavesmc.leaves.protocol.PcaSyncProtocol.disablePcaSyncProtocolGlobal();
}
// Leaves end - pca
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0047-Jade-Protocol.patch
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@ index 4aeab90e778629c355189dfe79c39c4b21f5f5ac..fe8c9b7e7956837829b4fe3eb449b2c0
}

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0ad7ab0d8e760e9da1d59bfbbd9ed8b075a35116..10918ba0d670c480d54b0c1c9ebba4fbd2513d83 100644
index 89c6141f0568a30b92ec2ba94f635e675f0c61e2..d47361166231c5ae3b93ab159632ab77bd35bc64 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -389,6 +389,7 @@ public final class CraftServer implements Server {
@@ -393,6 +393,7 @@ public final class CraftServer implements Server {
}
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
top.leavesmc.leaves.protocol.PcaSyncProtocol.init(); // Leaves - pca
+ top.leavesmc.leaves.protocol.JadeProtocol.init(); // Leaves - Jade
}

public boolean getCommandBlockOverride(String command) {
@@ -995,6 +996,11 @@ public final class CraftServer implements Server {
@@ -999,6 +1000,11 @@ public final class CraftServer implements Server {
top.leavesmc.leaves.protocol.BBORProtocol.loggedOutAllPlayer();
}
// Leaves end - bbor
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0055-Appleskin-Protocol.patch
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ index e0927206ab4b28ead4ed8eb095695066df384fb6..39e6206a36b2c10764b232cd079fd7b0
ServerLevel worldserver = entityplayer.serverLevel();

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 10918ba0d670c480d54b0c1c9ebba4fbd2513d83..65776427671e415dd19f807f84c025a6b8d73905 100644
index d47361166231c5ae3b93ab159632ab77bd35bc64..29309971e6e985586cbe68722efe0f2ef9bba528 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1001,6 +1001,13 @@ public final class CraftServer implements Server {
@@ -1005,6 +1005,13 @@ public final class CraftServer implements Server {
top.leavesmc.leaves.protocol.JadeProtocol.enableAllPlayer();
}
// Leaves end - Jade
Expand Down

0 comments on commit 2710cdf

Please sign in to comment.