Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-30 20:39:15 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-02-24 13:20:12 +08:00
parent 28da679a98
commit ecb001ceb0
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0045-PCA-sync-protocol.patch
View File

@@ -35,7 +35,7 @@ index b29b82faea67b025e35b990a64003b4b7c3aeffd..5cf311a6cbb3f831b7158f5464ef4987
byte[] data = new byte[packet.data.readableBytes()];
packet.data.readBytes(data);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 04885ae3016559e2f1cb6359ad8b558e19c3595a..4ea3a0ad550b95a6355d476760ec4a5db76f9b16 100644
index ea6b6536688607a42ba6d22a646ad1daa12fb32f..bb0c658a7e701ae1d8c72b14a9807822b175b4ea 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -334,6 +334,7 @@ public abstract class PlayerList {
@@ -205,10 +205,10 @@ index 41c9f074203915c31c1ae7a160ce509c13383f84..4c9e84dcd154a4306659ef41ab40127e
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
index 55006724ccec9f3de828ec18693728e9741ff65f..4391127a685fa16ce76e35f7c17b2d7056b13ea1 100644
index 0bab2693b91d5bab222c7db8bc6965ccde954003..99044c31cf703f7942a89dd57cdc65ddf3a58d75 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
@@ -328,6 +328,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
@@ -333,6 +333,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
}
@@ -289,10 +289,10 @@ index 881379681c39230a00b3a1f11cd87498984396c7..e01eb2025458cf311348c58a15308540
protected Component getDefaultName() {
return Component.translatable("container.dispenser");
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index ccad692aba2ed77259f6814d88f01b91ed9d229b..01bf32fd730000bdf3a71abe0ad9546ce3775ee7 100644
index d76603c4172aa10889949c6c2acff05fee02a13d..d24a1e3a19dccf0c672d064d44afe5c525dc696d 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -125,6 +125,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -127,6 +127,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
}
@@ -309,7 +309,7 @@ index ccad692aba2ed77259f6814d88f01b91ed9d229b..01bf32fd730000bdf3a71abe0ad9546c
@Override
protected Component getDefaultName() {
return Component.translatable("container.hopper");
@@ -165,6 +175,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -167,6 +177,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
if (flag) {
blockEntity.setCooldown(world.spigotConfig.hopperTransfer); // Spigot
setChanged(world, pos, state);
@@ -343,10 +343,10 @@ 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 a4f500464de6ee6e29cff84109357364e53de233..82b588b0736f18d265c1ab269fcbd4e47509d61e 100644
index b3f75263ed6c2b31e63ef97896ad297790442de7..e1ed4bbc77d24254242c9c246bf89daa6ed3c303 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -385,6 +385,7 @@ public final class CraftServer implements Server {
@@ -387,6 +387,7 @@ public final class CraftServer implements Server {
MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
}
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -354,7 +354,7 @@ index a4f500464de6ee6e29cff84109357364e53de233..82b588b0736f18d265c1ab269fcbd4e4
}
public boolean getCommandBlockOverride(String command) {
@@ -980,6 +981,13 @@ public final class CraftServer implements Server {
@@ -963,6 +964,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
@@ -369,7 +369,7 @@ index a4f500464de6ee6e29cff84109357364e53de233..82b588b0736f18d265c1ab269fcbd4e4
// 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))
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 27d791fa3f1c78ca5e7c32fbbdb357503458b419..c44850529dbff649a79cf0ee24c40550c9ea25f1 100644
index 03f618c9ba4f4f4c8ce4f3187be7e7fed8b6f8f8..29acea996719de0e1333e51df310678a7025267a 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -386,6 +386,21 @@ public final class LeavesConfig {