Skip to content

Commit

Permalink
add missing waxable and weatherable options for axe
Browse files Browse the repository at this point in the history
  • Loading branch information
granny committed Dec 15, 2023
1 parent 92a6325 commit 9e1216d
Show file tree
Hide file tree
Showing 51 changed files with 347 additions and 273 deletions.
6 changes: 3 additions & 3 deletions patches/server/0002-Purpur-config-files.patch
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ index 4b457cbfc56e55e0ae0fee5b69e2e75349702aab..fa38d6dd3a7439de3b2503a90637eabb
.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..61d193d8ddd87817bf2c560037d42366cff1eca9
index 0000000000000000000000000000000000000000..be3b733d7a641a7651ace1b3bd5ac56f26db5947
--- /dev/null
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -0,0 +1,175 @@
Expand Down Expand Up @@ -260,8 +260,8 @@ index 0000000000000000000000000000000000000000..61d193d8ddd87817bf2c560037d42366
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 33);
+ set("config-version", 33);
+ version = getInt("config-version", 34);
+ set("config-version", 34);
+
+ readConfig(PurpurConfig.class, null);
+
Expand Down
82 changes: 78 additions & 4 deletions patches/server/0186-Tool-actionable-options.patch

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions patches/server/0191-Big-dripleaf-tilt-delay.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ index 8e4a6a1188b2ce2825dc5750505212c72efb5c7b..c7f78ccb228d261984ac360f2ca6ae94
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 f540ecafbcc509ad5f6404ffc0d2047f8cd3d79f..e9069b48d19779ba9fda5ea736117b6f092b3efd 100644
index a6459228449b76956c61be7dd88b04e1edd04b11..8bbc9eea77aa96ebd20c5901c03b35e66e79ce63 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -744,6 +744,22 @@ public class PurpurWorldConfig {
@@ -818,6 +818,22 @@ public class PurpurWorldConfig {
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ index 6519fb56a7c6fd2e9ce3f4a0504053ed05eb0e14..3583d0c01410987584a53bb6e717d563
for (int i = 0; i < 64; ++i) {
if (this.teleport()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index e45b0f23cad0ad85915d1cbf1d3651a2d5b895a3..602f8111576de65d6059704cf5d81cba38172236 100644
index b2c7777ce1e8492d875c2575685d7668093c8eda..f78716c6d8635c21dacb216760a5ba0ebc33b73f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1360,6 +1360,7 @@ public class PurpurWorldConfig {
@@ -1434,6 +1434,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
+ public boolean endermanIgnoreProjectiles = false;
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1382,6 +1383,7 @@ public class PurpurWorldConfig {
@@ -1456,6 +1457,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ index 135ce8822ed7e3d6182755deca37a2c0531960c6..6a85de8af9b260e92b4ccffa2ae3503c

return InteractionResult.SUCCESS;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6c5fc242df9b0bf4d79a091105b7b113d801bf05..3c6a1dfe949d8c7347ad4990a5e148b74445a8d2 100644
index a56818870503b2694d9e4dd232b91e1c6a54333f..1e2860c910db8b2b6a73a67d040528df2c44f5f5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2765,6 +2765,8 @@ public class PurpurWorldConfig {
@@ -2839,6 +2839,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
Expand All @@ -30,7 +30,7 @@ index 6c5fc242df9b0bf4d79a091105b7b113d801bf05..3c6a1dfe949d8c7347ad4990a5e148b7
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2780,6 +2782,8 @@ public class PurpurWorldConfig {
@@ -2854,6 +2856,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ index 6469f5e25673b4e20cf0b520b28b14b2eda9130c..9e4146ecd36ff2698ee951660ed88290
if (!iblockdata.is(Blocks.KELP) && !iblockdata.is(Blocks.KELP_PLANT) && !iblockdata.is(Blocks.SEAGRASS) && !iblockdata.is(Blocks.TALL_SEAGRASS)) {
return false;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3c6a1dfe949d8c7347ad4990a5e148b74445a8d2..b96a936a584c21832a7890716743f1c918f2264d 100644
index 1e2860c910db8b2b6a73a67d040528df2c44f5f5..5cbbc7e818ed2e82a2ab17d7f3be35f2fe8c3c21 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -940,9 +940,13 @@ public class PurpurWorldConfig {
@@ -1014,9 +1014,13 @@ public class PurpurWorldConfig {

public int spongeAbsorptionArea = 65;
public int spongeAbsorptionRadius = 6;
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0199-Toggle-for-Wither-s-spawn-sound.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ index d2640173f3eca484123eb7bc9f6c4f796c9178fb..73c967330cc793acc029c17f037d985e
// this.level().globalLevelEvent(1023, new BlockPosition(this), 0);
int viewDistance = ((ServerLevel) this.level()).getCraftServer().getViewDistance() * 16;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b96a936a584c21832a7890716743f1c918f2264d..70b2bce9096d2e5486ee7932bada442a02b460a4 100644
index 5cbbc7e818ed2e82a2ab17d7f3be35f2fe8c3c21..b7e145289e241c0d2e02d90eafe3f2039be794c5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2610,6 +2610,7 @@ public class PurpurWorldConfig {
@@ -2684,6 +2684,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
+ public boolean witherPlaySpawnSound = true;
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2631,6 +2632,7 @@ public class PurpurWorldConfig {
@@ -2705,6 +2706,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ index a9629a102c4fa4e5720e63fcf4590e9231426c62..89c0006c06098e0d09a259ea8415d55b
return false;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 70b2bce9096d2e5486ee7932bada442a02b460a4..80f13907f068fc6c52595ea3cf93c1a4d5d03b69 100644
index b7e145289e241c0d2e02d90eafe3f2039be794c5..3dd2e8c271bbd24f2b4712934fc19a982ed4d1d2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -771,6 +771,11 @@ public class PurpurWorldConfig {
@@ -845,6 +845,11 @@ public class PurpurWorldConfig {
});
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0202-Conduit-behavior-configuration.patch
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
});

diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 073bd3a0c0d06269738b406b8de08db99e914f8d..029b938936289db6e2b202e1e307cf8d0fa56ec1 100644
index 3deab8fff2c67fdc47db8c739a29173d65b13bbf..3252984ac8bf8849f99f40182e8cb24a01ffe7f1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2831,4 +2831,27 @@ public class PurpurWorldConfig {
@@ -2905,4 +2905,27 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0203-Cauldron-fill-chances.patch
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ index bd22d3fdecbc992b11073a74d854b7d1b43c3f6a..0a3b97f18abcc9b385c9efd5a30f3e2c

if (dripChance < f1) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 029b938936289db6e2b202e1e307cf8d0fa56ec1..b27849dbddadf4388e5909b8fe74bcdab20c552f 100644
index 3252984ac8bf8849f99f40182e8cb24a01ffe7f1..2f5662582492573aef4efee54def5921be7351ea 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2854,4 +2854,15 @@ public class PurpurWorldConfig {
@@ -2928,4 +2928,15 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0205-Shulker-change-color-with-dye.patch
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ index bf3c02e78df66ca57773d667350197220df5d2d1..47abc81aa04774abeb97c912cd118bba
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 46b70a1fa8109fd1a6056dc5a854f6b3fdfb3034..a0ba55821e2d2a0c78c06e5756d8a591af85a536 100644
index 9bc0c44fa2f02596b716f4c180178b419e6c1194..f9b529da8e9367c3a7c9d89eb16760bc691ea59d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2170,6 +2170,7 @@ public class PurpurWorldConfig {
@@ -2244,6 +2244,7 @@ public class PurpurWorldConfig {
public double shulkerSpawnFromBulletNearbyRange = 8.0D;
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
+ public boolean shulkerChangeColorWithDye = false;
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2186,6 +2187,7 @@ public class PurpurWorldConfig {
@@ -2260,6 +2261,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ index 1c7bb504a576568bd275b4f1373208d37d1419e5..3d48293c34fa37ba5091c6058dadb32a
public static final Block PINK_PETALS = register("pink_petals", new PinkPetalsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.PINK_PETALS).pushReaction(PushReaction.DESTROY)));
public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS).pushReaction(PushReaction.DESTROY)));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8fe41200b26c0a17b6b65178aa858a74494471a6..0be19b3fc5fa6af23a3930a63e62199dffd538ea 100644
index f75b12f80e02c2b85c55c41096b4ee4759ce63b0..767659256e391854c0cd3035f138d86bbcaf6949 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -731,6 +731,11 @@ public class PurpurWorldConfig {
@@ -805,6 +805,11 @@ public class PurpurWorldConfig {
anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
}

Expand All @@ -60,7 +60,7 @@ index 8fe41200b26c0a17b6b65178aa858a74494471a6..0be19b3fc5fa6af23a3930a63e62199d
public int beaconLevelOne = 20;
public int beaconLevelTwo = 30;
public int beaconLevelThree = 40;
@@ -868,6 +873,11 @@ public class PurpurWorldConfig {
@@ -942,6 +947,11 @@ public class PurpurWorldConfig {
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,18 @@ index 75585a6b275fafbc5ef112d9de4926b77fcb3781..0453ba99a640855c6e13cb1e1d829298

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 c06d51200346d524a81e2d7a735db668da16c580..30761aaa2afe239f9233d5afee0252f53cf07086 100644
index 857df6dd4d1d598857d977107dcabbb25307ceab..727a70ef18192e27736ecdd6775711a17f8ce79b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1268,6 +1268,7 @@ public class PurpurWorldConfig {
@@ -1342,6 +1342,7 @@ public class PurpurWorldConfig {
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
+ public double dolphinNaturallyAggressiveToPlayersChance = 0.0D;
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1282,6 +1283,7 @@ public class PurpurWorldConfig {
@@ -1356,6 +1357,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ index f76b0d92150fd985a8fc699f6f884527d589dfd3..3c12e179861b5514e081d0db1664f717

@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 30761aaa2afe239f9233d5afee0252f53cf07086..3c4b6fed063a7ffcdf8f982e42c4599a129fb406 100644
index 727a70ef18192e27736ecdd6775711a17f8ce79b..e967ce42a54d97f28e50509167c7c7ac693a285b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1217,7 +1217,14 @@ public class PurpurWorldConfig {
@@ -1291,7 +1291,14 @@ public class PurpurWorldConfig {
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
public boolean cowTakeDamageFromWater = false;
Expand All @@ -75,7 +75,7 @@ index 30761aaa2afe239f9233d5afee0252f53cf07086..3c4b6fed063a7ffcdf8f982e42c4599a
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
cowControllable = getBoolean("mobs.cow.controllable", cowControllable);
@@ -1230,6 +1237,8 @@ public class PurpurWorldConfig {
@@ -1304,6 +1311,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ index 29916aa09d867ef3fa4dc8248b174bf8f97853b7..f78c41833169264fabc76d13bb4b9a89
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 3c4b6fed063a7ffcdf8f982e42c4599a129fb406..db9cb3292814b188abac8b1b9fdce1e5d7c4620a 100644
index e967ce42a54d97f28e50509167c7c7ac693a285b..83e4255059ca68f1fef3a8915662db28a98109b3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -750,6 +750,7 @@ public class PurpurWorldConfig {
@@ -824,6 +824,7 @@ public class PurpurWorldConfig {
}

public boolean bedExplode = true;
+ public boolean bedExplodeOnVillagerSleep = false;
public double bedExplosionPower = 5.0D;
public boolean bedExplosionFire = true;
public net.minecraft.world.level.Level.ExplosionInteraction bedExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
@@ -760,6 +761,7 @@ public class PurpurWorldConfig {
@@ -834,6 +835,7 @@ public class PurpurWorldConfig {
}
}
bedExplode = getBoolean("blocks.bed.explode", bedExplode);
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0214-Halloween-options-and-optimizations.patch
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ index 9b1ae2fa1681f1212b6a09d5b10b16634ce65470..728f4f2d7c37e253b0dab752f627a7b6
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 db9cb3292814b188abac8b1b9fdce1e5d7c4620a..9c2fc6c8d044c1f064010d856fac1b55626d96cb 100644
index 83e4255059ca68f1fef3a8915662db28a98109b3..285ea8571af68d86579e786912f1145dc0b83955 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1610,6 +1610,13 @@ public class PurpurWorldConfig {
@@ -1684,6 +1684,13 @@ public class PurpurWorldConfig {
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0217-Campfire-option-for-lit-when-placed.patch
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ index 7302d07c6ff69608e75ac52fdb19f2ec1d105129..35e2f279d358201384ff74fd767df18f

@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9c2fc6c8d044c1f064010d856fac1b55626d96cb..b5cf141a85b2ccb333f84f462ae484a8c7291efd 100644
index 285ea8571af68d86579e786912f1145dc0b83955..a7beb70988183ddcaf6bb2ef846eb9c640af46b0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -793,6 +793,11 @@ public class PurpurWorldConfig {
@@ -867,6 +867,11 @@ public class PurpurWorldConfig {
cactusBreaksFromSolidNeighbors = getBoolean("blocks.cactus.breaks-from-solid-neighbors", cactusBreaksFromSolidNeighbors);
}

Expand Down
Loading

0 comments on commit 9e1216d

Please sign in to comment.