SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move to configurate for paper.yml (#7609)

Browse Source
This commit is contained in:
Jake Potrebic
2022-06-09 01:51:45 -07:00
parent 01cf853f91
commit 2168417373
193 changed files with 4094 additions and 3835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/Preserve-overstacked-loot.patch
View File

@@ -9,22 +9,6 @@ chunk bans via the large amount of NBT created by unstacking the items.
Fixes GH-5140 and GH-4748.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
}
+ public boolean splitOverstackedLoot = true;
+ private void splitOverstackedLoot() {
+ splitOverstackedLoot = getBoolean("split-overstacked-loot", splitOverstackedLoot);
+ }
+
private com.google.common.collect.Table<String, String, Integer> sensorTickRates;
private com.google.common.collect.Table<String, String, Integer> behaviorTickRates;
private void tickRates() {
diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
@@ -40,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+
+ public static Consumer<ItemStack> createStackSplitter(Consumer<ItemStack> lootConsumer, @org.jetbrains.annotations.Nullable net.minecraft.server.level.ServerLevel world) {
+ boolean skipSplitter = world != null && !world.paperConfig.splitOverstackedLoot;
+ boolean skipSplitter = world != null && !world.paperConfig().fixes.splitOverstackedLoot;
+ // Paper end
return (itemstack) -> {
- if (itemstack.getCount() < itemstack.getMaxStackSize()) {