Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add automatic upgrade to add 1.19 strippables

Browse Source
This commit is contained in:
BillyGalbreath
2022-06-13 15:39:57 -05:00
parent f9e8de2a87
commit beb56e6e6c
42 changed files with 253 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0004-Purpur-config-files.patch
View File

@@ -172,7 +172,7 @@ index fbd604602024522bdd73aa1bde6fe2ccec63e442..516d26bcff64c828d3ec1607d3b774b5
.withRequiredArg()
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..e8bcb30f5236b4327883855275eb05d9f4f436e5
index 0000000000000000000000000000000000000000..e784bc02ee6bf9848396a1e3a3af58b0b959b0d3
--- /dev/null
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -0,0 +1,170 @@
@@ -250,8 +250,8 @@ index 0000000000000000000000000000000000000000..e8bcb30f5236b4327883855275eb05d9
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 28);
+ set("config-version", 28);
+ version = getInt("config-version", 29);
+ set("config-version", 29);
+
+ readConfig(PurpurConfig.class, null);
+ }

8
patches/server/0203-Tool-actionable-options.patch
View File

@@ -111,10 +111,10 @@ index 180aec596110309aade13d2080f8824d152b07cb..bf0e1f481b4c81f0663366bbe597b066
return InteractionResult.PASS;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bcb891f2530bcbfd7860e9f2bdf0a4b8e4a145f4..5a27ad943b7a82d12d9ba1f4c50993eae5f8290b 100644
index bcb891f2530bcbfd7860e9f2bdf0a4b8e4a145f4..280e85f781f6f92943f5797ea4e9d2dc1c138497 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -517,6 +517,155 @@ public class PurpurWorldConfig {
@@ -517,6 +517,159 @@ public class PurpurWorldConfig {
});
}
@@ -139,6 +139,10 @@ index bcb891f2530bcbfd7860e9f2bdf0a4b8e4a145f4..5a27ad943b7a82d12d9ba1f4c50993ea
+ PurpurConfig.config.set("world-settings.default.tools.hoe.tilling", null);
+ }
+ }
+ if (PurpurConfig.version < 29) {
+ PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:mangrove_log", Map.of("into", "minecraft:stripped_mangrove_log", "drops", new HashMap<String, Double>()));
+ PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:mangrove_wood", Map.of("into", "minecraft:stripped_mangrove_wood", "drops", new HashMap<String, Double>()));
+ }
+ getMap("tools.axe.strippables", Map.ofEntries(
+ Map.entry("minecraft:oak_wood", Map.of("into", "minecraft:stripped_oak_wood", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:oak_log", Map.of("into", "minecraft:stripped_oak_log", "drops", new HashMap<String, Double>())),

6
patches/server/0208-Silk-touchable-budding-amethyst.patch
View File

@@ -24,10 +24,10 @@ index bedccb8717d08d5a60058445b04ddff149e7d36c..5293ffca3da94c9c485a87d1232b6a90
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3604d3e3c0f5da24237d5b754eb240cd967c1e18..10b75d00a5f1cd4919b19434d1534380e14838ea 100644
index f133ee81a0a1d65b4f1aaea82a7b4146f9ed6ff6..2b87c946b29460e0b6bad4f46b3fce6bd7ed8886 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -700,6 +700,11 @@ public class PurpurWorldConfig {
@@ -704,6 +704,11 @@ public class PurpurWorldConfig {
}
}
@@ -39,7 +39,7 @@ index 3604d3e3c0f5da24237d5b754eb240cd967c1e18..10b75d00a5f1cd4919b19434d1534380
public boolean chestOpenWithBlockOnTop = false;
private void chestSettings() {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
@@ -2714,3 +2719,4 @@ public class PurpurWorldConfig {
@@ -2718,3 +2723,4 @@ public class PurpurWorldConfig {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
}

4
patches/server/0209-Big-dripleaf-tilt-delay.patch
View File

@@ -24,10 +24,10 @@ index 63aa6b82ba21ec8e8f362b390063e4e275a979a5..81ed6e69494337f402a6d9f854fb26fa
if (i != -1) {
world.scheduleTick(blockposition, (Block) this, i);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 10b75d00a5f1cd4919b19434d1534380e14838ea..9baca57031c15f464822ec1a2992fa77db59a982 100644
index 2b87c946b29460e0b6bad4f46b3fce6bd7ed8886..c3e531123b83de34fafefc8c406da090ff6df089 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -700,6 +700,22 @@ public class PurpurWorldConfig {
@@ -704,6 +704,22 @@ public class PurpurWorldConfig {
}
}

6
patches/server/0211-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
View File

@@ -18,10 +18,10 @@ index b0c4c90ab2d532a60911d53ac4764dcf49fff6c8..372400d5ce38407b577e5ee403ce39fc
boolean flag;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3f543eaeded95dec7ac0415fbcfc05136e41b110..a32f2c8de93b39caa32e8ff6f1989945c68a7bd7 100644
index 0fcd4d4a81519262a2c3c961bcb46548ea7a0955..c69967d0ecfdaf6e20117710bc44f4f02bb81c69 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1294,6 +1294,7 @@ public class PurpurWorldConfig {
@@ -1298,6 +1298,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
@@ -29,7 +29,7 @@ index 3f543eaeded95dec7ac0415fbcfc05136e41b110..a32f2c8de93b39caa32e8ff6f1989945
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1316,6 +1317,7 @@ public class PurpurWorldConfig {
@@ -1320,6 +1321,7 @@ public class PurpurWorldConfig {
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);

6
patches/server/0213-Config-to-prevent-horses-from-standing-with-riders.patch
View File

@@ -20,10 +20,10 @@ index a1ffa88c3796df2973a2fc0aeafda5f78208bf85..7466c437b2e996f16a08aaefc5c2b7cb
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7b7a850a048559914f7188c5d8c3fbe9dcadcbb5..0f3d8432a320838d318a788114a62d913dbfbe6f 100644
index 5ba395226887fd3afec971b5ee6e7d6cf6ce0673..129a017066c464ed6342db9782e2c7545b57a3cd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1524,6 +1524,7 @@ public class PurpurWorldConfig {
@@ -1528,6 +1528,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMax = 0.3375D;
public int horseBreedingTicks = 6000;
public boolean horseTakeDamageFromWater = false;
@@ -31,7 +31,7 @@ index 7b7a850a048559914f7188c5d8c3fbe9dcadcbb5..0f3d8432a320838d318a788114a62d91
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1541,6 +1542,7 @@ public class PurpurWorldConfig {
@@ -1545,6 +1546,7 @@ public class PurpurWorldConfig {
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
horseTakeDamageFromWater = getBoolean("mobs.horse.takes-damage-from-water", horseTakeDamageFromWater);

6
patches/server/0216-Customizeable-Zombie-Villager-curing-times.patch
View File

@@ -18,10 +18,10 @@ index c90cf19a4c29aa33c96a67bfab24cbbb56d783da..54b5749a5e40ed9042af1c4904afcdc4
return InteractionResult.SUCCESS;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ab71611680e0361269d4a27729cbf24d09ed406d..599c59f803319459d676211ba1ae0e97947d506a 100644
index 943e36e1e10240789836452d214505fd5f49bbd6..1aaa871a1d39022b25e514f68f436bad52e45b10 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2700,6 +2700,8 @@ public class PurpurWorldConfig {
@@ -2704,6 +2704,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index ab71611680e0361269d4a27729cbf24d09ed406d..599c59f803319459d676211ba1ae0e97
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2715,6 +2717,8 @@ public class PurpurWorldConfig {
@@ -2719,6 +2721,8 @@ public class PurpurWorldConfig {
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);

4
patches/server/0217-Option-for-sponges-to-work-on-lava.patch
View File

@@ -18,10 +18,10 @@ index d96e3fbc0fd4275c29e7e6154ef66e9ed1a5d829..df04a571ebd3c04bc7b58c1ee5661a1f
++i;
if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 599c59f803319459d676211ba1ae0e97947d506a..60fccfcaa664a44170be86088e5249475b3a3149 100644
index 1aaa871a1d39022b25e514f68f436bad52e45b10..dadd4ae7e3f5f88e66499ce11baccf04d9b098c2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -900,9 +900,11 @@ public class PurpurWorldConfig {
@@ -904,9 +904,11 @@ public class PurpurWorldConfig {
public int spongeAbsorptionArea = 64;
public int spongeAbsorptionRadius = 6;

6
patches/server/0218-Toggle-for-Wither-s-spawn-sound.patch
View File

@@ -18,10 +18,10 @@ index 01397e9daf03a308707cc7e2bb85db68137d3021..0dd31e45252d54b8bfa3645b25c984de
// this.world.globalLevelEvent(1023, new BlockPosition(this), 0);
//int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 60fccfcaa664a44170be86088e5249475b3a3149..12c84e3d9f702fa881ecb7e5de68391c9c4aec0f 100644
index dadd4ae7e3f5f88e66499ce11baccf04d9b098c2..aa4331974afdd07c11353358fad4dec5309809e6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2545,6 +2545,7 @@ public class PurpurWorldConfig {
@@ -2549,6 +2549,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index 60fccfcaa664a44170be86088e5249475b3a3149..12c84e3d9f702fa881ecb7e5de68391c
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2566,6 +2567,7 @@ public class PurpurWorldConfig {
@@ -2570,6 +2571,7 @@ public class PurpurWorldConfig {
witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);

4
patches/server/0219-Cactus-breaks-from-solid-neighbors-config.patch
View File

@@ -18,10 +18,10 @@ index 0fbabb84ef13e68b12212d9bfeb885c78893c116..56fa0e377b20ed063e47358be9e6bba8
return false;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 12c84e3d9f702fa881ecb7e5de68391c9c4aec0f..e135bfd60a2b327b7a75a21f99a9d50cc89ec421 100644
index aa4331974afdd07c11353358fad4dec5309809e6..2ce8414941f4ef4fa5d1b45c9515a1bd0be7c5f1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -732,6 +732,11 @@ public class PurpurWorldConfig {
@@ -736,6 +736,11 @@ public class PurpurWorldConfig {
buddingAmethystSilkTouch = getBoolean("blocks.budding_amethyst.silk-touch", buddingAmethystSilkTouch);
}

4
patches/server/0221-Conduit-behavior-configuration.patch
View File

@@ -44,10 +44,10 @@ index 05eab04e4aec4151018f25b59f92ddbbb4c09f87..8db906e021ca57c7f2a1e7002647e5c5
}
CraftEventFactory.blockDamage = null;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c57b344beaf4565fbf887b46008ccaf3ab70e970..26f6ab76a64c92650df8d69b877982fd133bb1db 100644
index de0a8973d426544602b2f3ee95b9cdede86d7265..f8074566f211075cdfcbba1a5b54ff30dd329c14 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2764,5 +2764,28 @@ public class PurpurWorldConfig {
@@ -2768,5 +2768,28 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}

4
patches/server/0222-Cauldron-fill-chances.patch
View File

@@ -47,10 +47,10 @@ index ef15adf66ea994d15a7d2718dd3d22cd07c31f98..dd87e3efdeafb211c1e44f8dc3348830
if (dripChance < f1) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 26f6ab76a64c92650df8d69b877982fd133bb1db..e6984650f0c5aca4c78053f0ca1dfda2eb0efb45 100644
index f8074566f211075cdfcbba1a5b54ff30dd329c14..3782f9e3979003039fa42abd830639a31fcc03f0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2787,5 +2787,16 @@ public class PurpurWorldConfig {
@@ -2791,5 +2791,16 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}

6
patches/server/0224-Shulker-change-color-with-dye.patch
View File

@@ -47,10 +47,10 @@ index ada070d8e1a2d328c02455eb9e5ad056046bcd0a..691b59f784e34b061ea156a3236c09f2
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f959b938e55853275849950a30ab3d87aca1c9e8..574e53c1e58aee2c8159c3191b3ba7cff636447d 100644
index beec1bb2c0c606c53f18bb9c831ec8d098270483..20d396b63492712dacbb791040189301ab2df453 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2116,6 +2116,7 @@ public class PurpurWorldConfig {
@@ -2120,6 +2120,7 @@ public class PurpurWorldConfig {
public double shulkerSpawnFromBulletNearbyRange = 8.0D;
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
@@ -58,7 +58,7 @@ index f959b938e55853275849950a30ab3d87aca1c9e8..574e53c1e58aee2c8159c3191b3ba7cf
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2132,6 +2133,7 @@ public class PurpurWorldConfig {
@@ -2136,6 +2137,7 @@ public class PurpurWorldConfig {
shulkerSpawnFromBulletNearbyRange = getDouble("mobs.shulker.spawn-from-bullet.nearby-range", shulkerSpawnFromBulletNearbyRange);
shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);

6
patches/server/0228-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
View File

@@ -45,10 +45,10 @@ index bcc1ce196c1dbf60cf6ae73d95766dc41ed22012..ad0ee0d333ffd862fe74ac3a097c51d5
public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of(Material.MOSS, MaterialColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS)));
public static final Block BIG_DRIPLEAF = register("big_dripleaf", new BigDripleafBlock(BlockBehaviour.Properties.of(Material.PLANT).strength(0.1F).sound(SoundType.BIG_DRIPLEAF)));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4ef41536c09c487a3f602896d39a3c090d56a6ab..3732b0e26885bf458befde37914a901bfb5ec0ea 100644
index ae7c6a18cca40b779c1beefc44b8a96accb53d9a..ac8f98c7a7f580e7371884994a512820d18bfa74 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -692,6 +692,11 @@ public class PurpurWorldConfig {
@@ -696,6 +696,11 @@ public class PurpurWorldConfig {
anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);
}
@@ -60,7 +60,7 @@ index 4ef41536c09c487a3f602896d39a3c090d56a6ab..3732b0e26885bf458befde37914a901b
public int beaconLevelOne = 20;
public int beaconLevelTwo = 30;
public int beaconLevelThree = 40;
@@ -821,6 +826,11 @@ public class PurpurWorldConfig {
@@ -825,6 +830,11 @@ public class PurpurWorldConfig {
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
}

6
patches/server/0230-Dolphins-naturally-aggressive-to-players-chance.patch
View File

@@ -47,10 +47,10 @@ index 1e95fa49a5dc8b756756924cbaf12d49ad33a274..89e3eec134868f727d776ee8144b2915
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f1295559db2833f6acaad9a3f0a3c42405eef1fc..3bfee9e6574a71ccd1ad13131ac9759f268e5129 100644
index 484db044eff9196d294b8afc272798b892585fa6..75cf05bef0cadd50ec86cd501d5e3afeb6128915 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1200,6 +1200,7 @@ public class PurpurWorldConfig {
@@ -1204,6 +1204,7 @@ public class PurpurWorldConfig {
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index f1295559db2833f6acaad9a3f0a3c42405eef1fc..3bfee9e6574a71ccd1ad13131ac9759f
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1214,6 +1215,7 @@ public class PurpurWorldConfig {
@@ -1218,6 +1219,7 @@ public class PurpurWorldConfig {
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);

6
patches/server/0231-Cows-naturally-aggressive-to-players-chance.patch
View File

@@ -59,10 +59,10 @@ index 00eec3f51e62858e7b85b3340e76bf66bfd4370f..b5002526f20fb8ae52783a6ba95ccd2d
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3bfee9e6574a71ccd1ad13131ac9759f268e5129..5d86e4dff7c77e379eb65a845efcd3521185c24f 100644
index 75cf05bef0cadd50ec86cd501d5e3afeb6128915..ad6ef83004344c4b7b23261a1757224ef25d9312 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1149,7 +1149,14 @@ public class PurpurWorldConfig {
@@ -1153,7 +1153,14 @@ public class PurpurWorldConfig {
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
public boolean cowTakeDamageFromWater = false;
@@ -77,7 +77,7 @@ index 3bfee9e6574a71ccd1ad13131ac9759f268e5129..5d86e4dff7c77e379eb65a845efcd352
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
cowControllable = getBoolean("mobs.cow.controllable", cowControllable);
@@ -1162,6 +1169,8 @@ public class PurpurWorldConfig {
@@ -1166,6 +1173,8 @@ public class PurpurWorldConfig {
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);
cowTakeDamageFromWater = getBoolean("mobs.cow.takes-damage-from-water", cowTakeDamageFromWater);

4
patches/server/0232-Option-for-beds-to-explode-on-villager-sleep.patch
View File

@@ -22,10 +22,10 @@ index 89435b0742064d77c7cc8bb871949acc9852f2c0..f04778287545e9619ee0359f1e51151d
this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error
this.brain.eraseMemory(MemoryModuleType.WALK_TARGET);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5d86e4dff7c77e379eb65a845efcd3521185c24f..b66fcc5ca2bea4d67cc8355ca9adbe97111b44bc 100644
index ad6ef83004344c4b7b23261a1757224ef25d9312..abe7518b86340dd3a04044b445bb0a7286773188 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -711,11 +711,13 @@ public class PurpurWorldConfig {
@@ -715,11 +715,13 @@ public class PurpurWorldConfig {
}
public boolean bedExplode = true;

4
patches/server/0233-Halloween-options-and-optimizations.patch
View File

@@ -60,10 +60,10 @@ index 0748babe61be5e5082132af6c4a3bc82612b70b3..5b7a6fa9692933ceb40c36e2c684a98d
this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b66fcc5ca2bea4d67cc8355ca9adbe97111b44bc..749eede2d0360195fb6c93a09c49406399499929 100644
index abe7518b86340dd3a04044b445bb0a7286773188..71d90818d95cdeae57869058e7c12cf551f0cc85 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1542,6 +1542,13 @@ public class PurpurWorldConfig {
@@ -1546,6 +1546,13 @@ public class PurpurWorldConfig {
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
}

4
patches/server/0236-Campfire-option-for-lit-when-placed.patch
View File

@@ -18,10 +18,10 @@ index a4c44cb59dee29cf227dbb51bfc1576d89dfb2e3..551bacade8642e6aad17120d8a901bcc
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 749eede2d0360195fb6c93a09c49406399499929..ebe19dd2bcb419d961bb45558e064ed915b3d91e 100644
index 71d90818d95cdeae57869058e7c12cf551f0cc85..570bb9fa09881c07e51784015904bad5168390f5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -754,6 +754,11 @@ public class PurpurWorldConfig {
@@ -758,6 +758,11 @@ public class PurpurWorldConfig {
cactusBreaksFromSolidNeighbors = getBoolean("blocks.cactus.breaks-from-solid-neighbors", cactusBreaksFromSolidNeighbors);
}

6
patches/server/0238-Add-option-to-disable-zombie-villagers-cure.patch
View File

@@ -18,10 +18,10 @@ index 54b5749a5e40ed9042af1c4904afcdc4af157d82..07c2ea2d16c9df6107247507fcd09025
itemstack.shrink(1);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6a76db843326eded6b2e476e4fc37520274a527f..d043d160af858523837deb06733c5f02df84402f 100644
index 6678f464bab069435196cfbf38ea166d7ad39a0d..c43e8954f8ab8e54082e9a1f33090a21f62ec060 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2764,6 +2764,7 @@ public class PurpurWorldConfig {
@@ -2768,6 +2768,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerTakeDamageFromWater = false;
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index 6a76db843326eded6b2e476e4fc37520274a527f..d043d160af858523837deb06733c5f02
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2781,6 +2782,7 @@ public class PurpurWorldConfig {
@@ -2785,6 +2786,7 @@ public class PurpurWorldConfig {
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);

4
patches/server/0240-Signs-allow-color-codes.patch
View File

@@ -70,10 +70,10 @@ index 6c96c3dde4e1b1b1b6952841edb41006e73737e9..c02cf76cce353aff189b3e0a967e88f7
public CompoundTag getUpdateTag() {
return this.saveWithoutMetadata();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f3f7f34209739014528d127cbc80b7e6a1b2435f..ed484f609766a15c6097ee782ddb97bff1f11456 100644
index 0d2de5ec6b47dc2470e3f2f704076ff0d8b51778..57bc59537abfde26d1fe62f3661dc8eafd811e77 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -924,8 +924,10 @@ public class PurpurWorldConfig {
@@ -928,8 +928,10 @@ public class PurpurWorldConfig {
}
public boolean signRightClickEdit = false;

10
patches/server/0241-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
View File

@@ -131,10 +131,10 @@ index e5c135ec059746b75fe58516809584221285cdbe..b09ccc493c7503aa99a64d760b5bc769
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ed484f609766a15c6097ee782ddb97bff1f11456..3e5e8345f1faefefb057da639213fcbcc4f32551 100644
index 57bc59537abfde26d1fe62f3661dc8eafd811e77..68c173fac745593404b63e8e94ed8c62766bd2c6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -777,6 +777,11 @@ public class PurpurWorldConfig {
@@ -781,6 +781,11 @@ public class PurpurWorldConfig {
composterBulkProcess = getBoolean("blocks.composter.sneak-to-bulk-process", composterBulkProcess);
}
@@ -146,7 +146,7 @@ index ed484f609766a15c6097ee782ddb97bff1f11456..3e5e8345f1faefefb057da639213fcbc
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -871,6 +876,16 @@ public class PurpurWorldConfig {
@@ -875,6 +880,16 @@ public class PurpurWorldConfig {
mobsSpawnOnBlueIce = getBoolean("blocks.blue_ice.allow-mob-spawns", mobsSpawnOnBlueIce);
}
@@ -163,7 +163,7 @@ index ed484f609766a15c6097ee782ddb97bff1f11456..3e5e8345f1faefefb057da639213fcbc
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;
public int lavaSpeedNether = 10;
@@ -960,6 +975,16 @@ public class PurpurWorldConfig {
@@ -964,6 +979,16 @@ public class PurpurWorldConfig {
turtleEggsBypassMobGriefing = getBoolean("blocks.turtle_egg.bypass-mob-griefing", turtleEggsBypassMobGriefing);
}
@@ -180,7 +180,7 @@ index ed484f609766a15c6097ee782ddb97bff1f11456..3e5e8345f1faefefb057da639213fcbc
public boolean waterInfinite = true;
public int waterInfiniteRequiredSources = 2;
private void waterSources() {
@@ -967,6 +992,16 @@ public class PurpurWorldConfig {
@@ -971,6 +996,16 @@ public class PurpurWorldConfig {
waterInfiniteRequiredSources = getInt("blocks.water.infinite-required-sources", waterInfiniteRequiredSources);
}

274
patches/server/0242-Mobs-always-drop-experience.patch
View File

File diff suppressed because it is too large Load Diff

6
patches/server/0245-Option-to-prevent-spiders-from-climbing-world-border.patch
View File

@@ -39,10 +39,10 @@ index bdd4fc3072f7a5ea504ba35f6a08ae971e83b69f..b9ac8cefefe1f47548166330b7c889df
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 181556574fc6eedd748cc69e421c41401bf8cf66..56d69ba8a16837c86276e5f4f6334b7d69767534 100644
index 73fb5e6d26517f4ffdaef29e1aebbfee2c98802f..50cfe61d4efeae6b00bde8bea9cf3c36f244989e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2479,6 +2479,7 @@ public class PurpurWorldConfig {
@@ -2483,6 +2483,7 @@ public class PurpurWorldConfig {
public double spiderMaxHealth = 16.0D;
public boolean spiderTakeDamageFromWater = false;
public boolean spiderAlwaysDropExp = false;
@@ -50,7 +50,7 @@ index 181556574fc6eedd748cc69e421c41401bf8cf66..56d69ba8a16837c86276e5f4f6334b7d
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -2491,6 +2492,7 @@ public class PurpurWorldConfig {
@@ -2495,6 +2496,7 @@ public class PurpurWorldConfig {
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
spiderTakeDamageFromWater = getBoolean("mobs.spider.takes-damage-from-water", spiderTakeDamageFromWater);
spiderAlwaysDropExp = getBoolean("mobs.spider.always-drop-exp", spiderAlwaysDropExp);

4
patches/server/0246-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
View File

@@ -74,7 +74,7 @@ index d1d10a7a62c7372634e22d6df8fc7d085d051237..e6a37649900f55d7178f7cd876b71c5d
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 56d69ba8a16837c86276e5f4f6334b7d69767534..c6b423ca7023cb65cbaf983b427979607510db67 100644
index 50cfe61d4efeae6b00bde8bea9cf3c36f244989e..69c95e662d60ed63e4cdb4f33d59decd2de3190b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -552,6 +552,8 @@ public class PurpurWorldConfig {
@@ -86,7 +86,7 @@ index 56d69ba8a16837c86276e5f4f6334b7d69767534..c6b423ca7023cb65cbaf983b42797960
private void toolSettings() {
axeStrippables.clear();
axeWaxables.clear();
@@ -695,6 +697,8 @@ public class PurpurWorldConfig {
@@ -699,6 +701,8 @@ public class PurpurWorldConfig {
});
hoeTillables.put(block, new Tillable(condition, into, drops));
});

6
patches/server/0247-Shearing-jeb-produces-random-color-wool.patch
View File

@@ -18,10 +18,10 @@ index 63aeab7204ac954b2908207dc6e743d17aa27f2e..aa6f6e252f6f2933825b97bf1b9679fe
if (entityitem != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c6b423ca7023cb65cbaf983b427979607510db67..5dbdaeb306f6bde3f94921e1bd2b5e5eac0107f2 100644
index 69c95e662d60ed63e4cdb4f33d59decd2de3190b..a7638fd6b75d04b454388b952157a3a6c791dba0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2272,6 +2272,7 @@ public class PurpurWorldConfig {
@@ -2276,6 +2276,7 @@ public class PurpurWorldConfig {
public boolean sheepBypassMobGriefing = false;
public boolean sheepTakeDamageFromWater = false;
public boolean sheepAlwaysDropExp = false;
@@ -29,7 +29,7 @@ index c6b423ca7023cb65cbaf983b427979607510db67..5dbdaeb306f6bde3f94921e1bd2b5e5e
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -2286,6 +2287,7 @@ public class PurpurWorldConfig {
@@ -2290,6 +2291,7 @@ public class PurpurWorldConfig {
sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
sheepTakeDamageFromWater = getBoolean("mobs.sheep.takes-damage-from-water", sheepTakeDamageFromWater);
sheepAlwaysDropExp = getBoolean("mobs.sheep.always-drop-exp", sheepAlwaysDropExp);

4
patches/server/0248-Turtle-eggs-random-tick-crack-chance.patch
View File

@@ -32,10 +32,10 @@ index 4907e0acb7d01b7f57b75579e58ce743e3e000bb..5e6df1d6cbaecb986d1b8d382fe673a2
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5dbdaeb306f6bde3f94921e1bd2b5e5eac0107f2..2724dc07320191fd84aa5564742b35872b16705f 100644
index a7638fd6b75d04b454388b952157a3a6c791dba0..5dff0bfe5c9f92213715b46f37c87f8da379780b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -972,11 +972,13 @@ public class PurpurWorldConfig {
@@ -976,11 +976,13 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleEggsBypassMobGriefing = false;

14
patches/server/0249-Mob-head-visibility-percent.patch
View File

@@ -29,10 +29,10 @@ index 6e7af1939df4ff99d6d4645f7ed270110d9d0373..d120c8808c6a8df2c8615fe02f2c8a5b
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2724dc07320191fd84aa5564742b35872b16705f..323b2cae0ce30b9eae0bc94e3780d3e3ce71c1ff 100644
index 5dff0bfe5c9f92213715b46f37c87f8da379780b..f19e95fecdf19bf56d456e4e35edbe0abe5d5839 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1260,6 +1260,7 @@ public class PurpurWorldConfig {
@@ -1264,6 +1264,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -40,7 +40,7 @@ index 2724dc07320191fd84aa5564742b35872b16705f..323b2cae0ce30b9eae0bc94e3780d3e3
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1277,6 +1278,7 @@ public class PurpurWorldConfig {
@@ -1281,6 +1282,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -48,7 +48,7 @@ index 2724dc07320191fd84aa5564742b35872b16705f..323b2cae0ce30b9eae0bc94e3780d3e3
}
public boolean dolphinRidable = false;
@@ -2352,6 +2354,7 @@ public class PurpurWorldConfig {
@@ -2356,6 +2358,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -56,7 +56,7 @@ index 2724dc07320191fd84aa5564742b35872b16705f..323b2cae0ce30b9eae0bc94e3780d3e3
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2364,6 +2367,7 @@ public class PurpurWorldConfig {
@@ -2368,6 +2371,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -64,7 +64,7 @@ index 2724dc07320191fd84aa5564742b35872b16705f..323b2cae0ce30b9eae0bc94e3780d3e3
}
public boolean skeletonHorseRidableInWater = true;
@@ -2891,6 +2895,7 @@ public class PurpurWorldConfig {
@@ -2895,6 +2899,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -72,7 +72,7 @@ index 2724dc07320191fd84aa5564742b35872b16705f..323b2cae0ce30b9eae0bc94e3780d3e3
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2909,6 +2914,7 @@ public class PurpurWorldConfig {
@@ -2913,6 +2918,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);

6
patches/server/0252-Stop-bees-from-dying-after-stinging.patch
View File

@@ -17,10 +17,10 @@ index 4b9d13fb36d0e35f1cc7a5d95b26dc5f8ded0d6a..a6378e6db70ba80aaa18954766f029cd
++this.timeSinceSting;
if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, (int) 1, (int) 1200)) == 0) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 323b2cae0ce30b9eae0bc94e3780d3e3ce71c1ff..5fd6e5a151302f5da6fb80d48fabd8bf6f091e9a 100644
index f19e95fecdf19bf56d456e4e35edbe0abe5d5839..88bffce4f59c9d52ccaff90eeded2e375cc50f7a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1080,6 +1080,7 @@ public class PurpurWorldConfig {
@@ -1084,6 +1084,7 @@ public class PurpurWorldConfig {
public boolean beeCanWorkAtNight = false;
public boolean beeCanWorkInRain = false;
public boolean beeAlwaysDropExp = false;
@@ -28,7 +28,7 @@ index 323b2cae0ce30b9eae0bc94e3780d3e3ce71c1ff..5fd6e5a151302f5da6fb80d48fabd8bf
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -1096,6 +1097,7 @@ public class PurpurWorldConfig {
@@ -1100,6 +1101,7 @@ public class PurpurWorldConfig {
beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);
beeAlwaysDropExp = getBoolean("mobs.bee.always-drop-exp", beeAlwaysDropExp);

6
patches/server/0254-Configurable-farmland-trample-height.patch
View File

@@ -35,10 +35,10 @@ index e5a3e3a4367dfb924624a913b816b3fd56e3fefd..7068cb39ab264fa0c65febff01236b8d
org.bukkit.event.Cancellable cancellable;
if (entity instanceof Player) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5fd6e5a151302f5da6fb80d48fabd8bf6f091e9a..00658cb51ea67c41968dea1375dc177e609ddd69 100644
index 88bffce4f59c9d52ccaff90eeded2e375cc50f7a..fc16dbc73fda459e4832b555e20fcce914a90cb6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -843,6 +843,7 @@ public class PurpurWorldConfig {
@@ -847,6 +847,7 @@ public class PurpurWorldConfig {
public boolean farmlandTramplingDisabled = false;
public boolean farmlandTramplingOnlyPlayers = false;
public boolean farmlandTramplingFeatherFalling = false;
@@ -46,7 +46,7 @@ index 5fd6e5a151302f5da6fb80d48fabd8bf6f091e9a..00658cb51ea67c41968dea1375dc177e
private void farmlandSettings() {
farmlandBypassMobGriefing = getBoolean("blocks.farmland.bypass-mob-griefing", farmlandBypassMobGriefing);
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
@@ -850,6 +851,7 @@ public class PurpurWorldConfig {
@@ -854,6 +855,7 @@ public class PurpurWorldConfig {
farmlandTramplingDisabled = getBoolean("blocks.farmland.disable-trampling", farmlandTramplingDisabled);
farmlandTramplingOnlyPlayers = getBoolean("blocks.farmland.only-players-trample", farmlandTramplingOnlyPlayers);
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);

6
patches/server/0258-Configurable-phantom-size.patch
View File

@@ -22,10 +22,10 @@ index 33b347474b7485633ca77bdff28e4b32580b51b8..bfca1101025e473c97cd4804e74bed04
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d9148ccbdca242a1e4f79e537bb61354eb8de642..ca0e906481d6871efa8b7261fcd88157ff1b5f6a 100644
index 10535d574d71b5d3265f2d7fc6d739c028e503f2..369e4dd447cac95cb7325c2f1239f9c5527c5070 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2011,6 +2011,8 @@ public class PurpurWorldConfig {
@@ -2015,6 +2015,8 @@ public class PurpurWorldConfig {
public boolean phantomFlamesOnSwoop = false;
public boolean phantomTakeDamageFromWater = false;
public boolean phantomAlwaysDropExp = false;
@@ -34,7 +34,7 @@ index d9148ccbdca242a1e4f79e537bb61354eb8de642..ca0e906481d6871efa8b7261fcd88157
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -2053,6 +2055,13 @@ public class PurpurWorldConfig {
@@ -2057,6 +2059,13 @@ public class PurpurWorldConfig {
phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater);
phantomAlwaysDropExp = getBoolean("mobs.phantom.always-drop-exp", phantomAlwaysDropExp);

6
patches/server/0261-Configurable-minimum-demand-for-trades.patch
View File

@@ -40,10 +40,10 @@ index 8a9a701baabdaf066cd9b28c05430f673fcafb4e..17cc3237c7fc8ceda136b2371fabf6f0
public ItemStack assemble() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ca0e906481d6871efa8b7261fcd88157ff1b5f6a..ef79bfec7ce236cc8f5929e19c3d62f75c390b89 100644
index 369e4dd447cac95cb7325c2f1239f9c5527c5070..73fae5e2af9d75bdc449febf34557f68b98c0f0c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2689,6 +2689,7 @@ public class PurpurWorldConfig {
@@ -2693,6 +2693,7 @@ public class PurpurWorldConfig {
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index ca0e906481d6871efa8b7261fcd88157ff1b5f6a..ef79bfec7ce236cc8f5929e19c3d62f7
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2711,6 +2712,7 @@ public class PurpurWorldConfig {
@@ -2715,6 +2716,7 @@ public class PurpurWorldConfig {
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);

6
patches/server/0262-Lobotomize-stuck-villagers.patch
View File

@@ -111,10 +111,10 @@ index f0b910df1ee471b4d72d97c6197ab14f2854976e..6ce32a52d621a0c2629568ea07e445f5
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ef79bfec7ce236cc8f5929e19c3d62f75c390b89..89c8829b7e579647bb2c7e3319a221bc5c1227f4 100644
index 73fae5e2af9d75bdc449febf34557f68b98c0f0c..829b0d20d24855416138825066ff03d9baceb193 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2690,6 +2690,8 @@ public class PurpurWorldConfig {
@@ -2694,6 +2694,8 @@ public class PurpurWorldConfig {
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
public int villagerMinimumDemand = 0;
@@ -123,7 +123,7 @@ index ef79bfec7ce236cc8f5929e19c3d62f75c390b89..89c8829b7e579647bb2c7e3319a221bc
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2713,6 +2715,17 @@ public class PurpurWorldConfig {
@@ -2717,6 +2719,17 @@ public class PurpurWorldConfig {
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
villagerMinimumDemand = getInt("mobs.villager.minimum-demand", villagerMinimumDemand);

6
patches/server/0263-Option-for-villager-display-trade-item.patch
View File

@@ -17,10 +17,10 @@ index 385f3df7044e3f03f17c3ec7484b268004a3def9..90ba6a3abf62e4b272fada96b554ca31
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 89c8829b7e579647bb2c7e3319a221bc5c1227f4..30a9b11a7b4c423b03057a0f899e0a510a929043 100644
index 829b0d20d24855416138825066ff03d9baceb193..8e6201dd9fbacb9f8fae3a2013d5efe7b16b5400 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2692,6 +2692,7 @@ public class PurpurWorldConfig {
@@ -2696,6 +2696,7 @@ public class PurpurWorldConfig {
public int villagerMinimumDemand = 0;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
@@ -28,7 +28,7 @@ index 89c8829b7e579647bb2c7e3319a221bc5c1227f4..30a9b11a7b4c423b03057a0f899e0a51
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2726,6 +2727,7 @@ public class PurpurWorldConfig {
@@ -2730,6 +2731,7 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);

4
patches/server/0265-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
View File

@@ -17,10 +17,10 @@ index 18389f46902bb9879ac6d734723e9a720724dc48..b2b8663a9cff08bacdab91c7bb014ba6
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 30a9b11a7b4c423b03057a0f899e0a510a929043..2fc992873e56daa9525c980d62c973fa9775fb7c 100644
index 8e6201dd9fbacb9f8fae3a2013d5efe7b16b5400..3efe2f056b4186093248ef8faaba5ba664e849dd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -961,8 +961,10 @@ public class PurpurWorldConfig {
@@ -965,8 +965,10 @@ public class PurpurWorldConfig {
}
public boolean spawnerDeactivateByRedstone = false;

4
patches/server/0267-Anvil-repair-damage-options.patch
View File

@@ -64,10 +64,10 @@ index 1b23352a9deae37f9c947fef1b1f8a2875507cfa..ad5aad3682926e2e8965bb87ad8d5381
return InteractionResult.SUCCESS;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0477f4a04154bd5851b4b7b4c23545d6be79af1d..30b0b93e43713281f4fd7e7dc04e6b91a263dcbb 100644
index cc785c36228fb3653cbbc9cd8d9923d8c8d69a53..145b8e2cf1929203a0c9cdc39c9985ec8020c9d7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -708,8 +708,12 @@ public class PurpurWorldConfig {
@@ -712,8 +712,12 @@ public class PurpurWorldConfig {
}
public boolean anvilAllowColors = false;

4
patches/server/0269-Option-to-disable-turtle-egg-trampling-with-feather-.patch
View File

@@ -20,10 +20,10 @@ index 5e6df1d6cbaecb986d1b8d382fe673a2cbb76115..6151226a88a9ca44955821521641e788
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 30b0b93e43713281f4fd7e7dc04e6b91a263dcbb..f5db78c3ee2e18cec0dbe8dfa8da9aafce54c416 100644
index 145b8e2cf1929203a0c9cdc39c9985ec8020c9d7..65236d76e7b3c4bd0a493529eebc5b3f971fbfb2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -987,12 +987,14 @@ public class PurpurWorldConfig {
@@ -991,12 +991,14 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleEggsBypassMobGriefing = false;
public int turtleEggsRandomTickCrackChance = 500;

6
patches/server/0271-Config-to-prevent-horses-from-standing-when-hurt.patch
View File

@@ -21,10 +21,10 @@ index 7466c437b2e996f16a08aaefc5c2b7cba216a14c..205ce2bd91a98a0c67d3c5dd640eb88c
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f5db78c3ee2e18cec0dbe8dfa8da9aafce54c416..b5eb0b642dff985ea14e7233e47b18568c1dba32 100644
index 65236d76e7b3c4bd0a493529eebc5b3f971fbfb2..64f580007451ff1b5d8efd9ffc9d70a97bf76441 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1703,6 +1703,7 @@ public class PurpurWorldConfig {
@@ -1707,6 +1707,7 @@ public class PurpurWorldConfig {
public int horseBreedingTicks = 6000;
public boolean horseTakeDamageFromWater = false;
public boolean horseStandWithRider = true;
@@ -32,7 +32,7 @@ index f5db78c3ee2e18cec0dbe8dfa8da9aafce54c416..b5eb0b642dff985ea14e7233e47b1856
public boolean horseAlwaysDropExp = false;
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
@@ -1722,6 +1723,7 @@ public class PurpurWorldConfig {
@@ -1726,6 +1727,7 @@ public class PurpurWorldConfig {
horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
horseTakeDamageFromWater = getBoolean("mobs.horse.takes-damage-from-water", horseTakeDamageFromWater);
horseStandWithRider = getBoolean("mobs.horse.stand-with-rider", horseStandWithRider);

6
patches/server/0273-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -18,10 +18,10 @@ index ace39b0585c67b2764d75ff9e64d132347157a51..20668d53625ec88ba3eb2a655ad3f6bc
AABB axisalignedbb = this.getBoundingBox().inflate(10.0D, 10.0D, 10.0D);
List<Villager> list = world.getEntitiesOfClass(Villager.class, axisalignedbb);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b5eb0b642dff985ea14e7233e47b18568c1dba32..7ead92409e1293d2786d42951a69c19cc8fefd16 100644
index 64f580007451ff1b5d8efd9ffc9d70a97bf76441..c64d1107119792e3f523bbc39a5a711d209585c9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2705,6 +2705,8 @@ public class PurpurWorldConfig {
@@ -2709,6 +2709,8 @@ public class PurpurWorldConfig {
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
public boolean villagerDisplayTradeItem = true;
@@ -30,7 +30,7 @@ index b5eb0b642dff985ea14e7233e47b18568c1dba32..7ead92409e1293d2786d42951a69c19c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2740,6 +2742,8 @@ public class PurpurWorldConfig {
@@ -2744,6 +2746,8 @@ public class PurpurWorldConfig {
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);

6
patches/server/0274-Stonecutter-damage.patch
View File

@@ -80,7 +80,7 @@ index 019e095647225f3d61f0759c8787171a45acdaca..13a5d4338ca2a9ea9a9c520687bc1d5b
throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.msgId));
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index d987bf03974511bdabfe8410d6f3008c2fa9ec67..8cb74c78f6925d3016f7367835a0929840404fb2 100644
index 619b6bb634e3be722b1e8ab8a7a5974f494da1ff..3d96a49cca34f0a3f3b37de839e476c2a4c1f1d6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -200,8 +200,10 @@ public class PurpurConfig {
@@ -95,10 +95,10 @@ index d987bf03974511bdabfe8410d6f3008c2fa9ec67..8cb74c78f6925d3016f7367835a09298
public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7ead92409e1293d2786d42951a69c19cc8fefd16..f55a93e835909603ffa0ca496e61841c429f3bf9 100644
index c64d1107119792e3f523bbc39a5a711d209585c9..f781ea51472cea86d8eb5279326d21a63710b426 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -982,6 +982,11 @@ public class PurpurWorldConfig {
@@ -986,6 +986,11 @@ public class PurpurWorldConfig {
spongeAbsorbsLava = getBoolean("blocks.sponge.absorbs-lava", spongeAbsorbsLava);
}

4
patches/server/0275-Configurable-damage-settings-for-magma-blocks.patch
View File

@@ -18,10 +18,10 @@ index d3540a4daaa8021ae009bfd4d9ef4f1172ab4c56..2b250439f263f64db7920536ed6eaf64
entity.hurt(DamageSource.HOT_FLOOR, 1.0F);
org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f55a93e835909603ffa0ca496e61841c429f3bf9..fc14078dc670f739be9b7f8a6fe1a89ee107624d 100644
index f781ea51472cea86d8eb5279326d21a63710b426..d0c725d8fb610a276d96370359eaab7010c85b53 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -918,6 +918,13 @@ public class PurpurWorldConfig {
@@ -922,6 +922,13 @@ public class PurpurWorldConfig {
pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit);
}

4
patches/server/0276-Add-config-for-snow-on-blue-ice.patch
View File

@@ -22,10 +22,10 @@ index 14e00c7feb1c051d56a3d27cd00dcef072dd771a..4952fb1aaaafb55baa0fddb389f966a1
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fc14078dc670f739be9b7f8a6fe1a89ee107624d..098fdaa887f116c6a163ae5345aea7edefe669d6 100644
index d0c725d8fb610a276d96370359eaab7010c85b53..80b827eb45092a9069a9dced5b04eebce7b82b58 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -887,9 +887,11 @@ public class PurpurWorldConfig {
@@ -891,9 +891,11 @@ public class PurpurWorldConfig {
public boolean mobsSpawnOnPackedIce = true;
public boolean mobsSpawnOnBlueIce = true;