add mangrove_wood and mangrove_log to strippables config

This commit is contained in:
granny
2022-06-13 13:24:46 -07:00
parent 146750b2de
commit f9e8de2a87
41 changed files with 247 additions and 245 deletions

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..67344a5ae42d670ff8e86f62714b637d5252c160 100644
index bcb891f2530bcbfd7860e9f2bdf0a4b8e4a145f4..5a27ad943b7a82d12d9ba1f4c50993eae5f8290b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -517,6 +517,153 @@ public class PurpurWorldConfig {
@@ -517,6 +517,155 @@ public class PurpurWorldConfig {
});
}
@@ -152,6 +152,8 @@ index bcb891f2530bcbfd7860e9f2bdf0a4b8e4a145f4..67344a5ae42d670ff8e86f62714b637d
+ Map.entry("minecraft:jungle_log", Map.of("into", "minecraft:stripped_jungle_log", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:spruce_wood", Map.of("into", "minecraft:stripped_spruce_wood", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:spruce_log", Map.of("into", "minecraft:stripped_spruce_log", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:mangrove_wood", Map.of("into", "minecraft:stripped_mangrove_wood", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:mangrove_log", Map.of("into", "minecraft:stripped_mangrove_log", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:warped_stem", Map.of("into", "minecraft:stripped_warped_stem", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:warped_hyphae", Map.of("into", "minecraft:stripped_warped_hyphae", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:crimson_stem", Map.of("into", "minecraft:stripped_crimson_stem", "drops", new HashMap<String, Double>())),

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 f228e69e8614039406297522199dd2733f65014a..25556f3d399e9c9f0e28016a80f332b2b3e7a67c 100644
index 3604d3e3c0f5da24237d5b754eb240cd967c1e18..10b75d00a5f1cd4919b19434d1534380e14838ea 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -698,6 +698,11 @@ public class PurpurWorldConfig {
@@ -700,6 +700,11 @@ public class PurpurWorldConfig {
}
}
@@ -39,7 +39,7 @@ index f228e69e8614039406297522199dd2733f65014a..25556f3d399e9c9f0e28016a80f332b2
public boolean chestOpenWithBlockOnTop = false;
private void chestSettings() {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
@@ -2712,3 +2717,4 @@ public class PurpurWorldConfig {
@@ -2714,3 +2719,4 @@ public class PurpurWorldConfig {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
}

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 25556f3d399e9c9f0e28016a80f332b2b3e7a67c..897bbfd91828124074a996dc63d17a2a7a196d2c 100644
index 10b75d00a5f1cd4919b19434d1534380e14838ea..9baca57031c15f464822ec1a2992fa77db59a982 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -698,6 +698,22 @@ public class PurpurWorldConfig {
@@ -700,6 +700,22 @@ public class PurpurWorldConfig {
}
}

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 c475c40279368e61683a338a8e9d8cacf14ed2ef..4cc629ee614c4ff43181af6992786c4eac190f5a 100644
index 3f543eaeded95dec7ac0415fbcfc05136e41b110..a32f2c8de93b39caa32e8ff6f1989945c68a7bd7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1292,6 +1292,7 @@ public class PurpurWorldConfig {
@@ -1294,6 +1294,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
@@ -29,7 +29,7 @@ index c475c40279368e61683a338a8e9d8cacf14ed2ef..4cc629ee614c4ff43181af6992786c4e
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1314,6 +1315,7 @@ public class PurpurWorldConfig {
@@ -1316,6 +1317,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);

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 26d9943ada0bec112c5fc1ccc67d1af2a5308001..f090de52394d0958cf73458db374f68fb75f5c58 100644
index 7b7a850a048559914f7188c5d8c3fbe9dcadcbb5..0f3d8432a320838d318a788114a62d913dbfbe6f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1522,6 +1522,7 @@ public class PurpurWorldConfig {
@@ -1524,6 +1524,7 @@ public class PurpurWorldConfig {
public double horseMovementSpeedMax = 0.3375D;
public int horseBreedingTicks = 6000;
public boolean horseTakeDamageFromWater = false;
@@ -31,7 +31,7 @@ index 26d9943ada0bec112c5fc1ccc67d1af2a5308001..f090de52394d0958cf73458db374f68f
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1539,6 +1540,7 @@ public class PurpurWorldConfig {
@@ -1541,6 +1542,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);

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 63a5e3cf2f185b07e053b162a890389732865f98..bd31781285e5df2122ca0b499dca997e092e7cea 100644
index ab71611680e0361269d4a27729cbf24d09ed406d..599c59f803319459d676211ba1ae0e97947d506a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2698,6 +2698,8 @@ public class PurpurWorldConfig {
@@ -2700,6 +2700,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index 63a5e3cf2f185b07e053b162a890389732865f98..bd31781285e5df2122ca0b499dca997e
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2713,6 +2715,8 @@ public class PurpurWorldConfig {
@@ -2715,6 +2717,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);

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 bd31781285e5df2122ca0b499dca997e092e7cea..862b8f58b3da812f33406ae3b1858809c3c0b196 100644
index 599c59f803319459d676211ba1ae0e97947d506a..60fccfcaa664a44170be86088e5249475b3a3149 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -898,9 +898,11 @@ public class PurpurWorldConfig {
@@ -900,9 +900,11 @@ public class PurpurWorldConfig {
public int spongeAbsorptionArea = 64;
public int spongeAbsorptionRadius = 6;

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 862b8f58b3da812f33406ae3b1858809c3c0b196..2e75e7c7317cb9c57cb3f36e38d9334fa7e9378a 100644
index 60fccfcaa664a44170be86088e5249475b3a3149..12c84e3d9f702fa881ecb7e5de68391c9c4aec0f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2543,6 +2543,7 @@ public class PurpurWorldConfig {
@@ -2545,6 +2545,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index 862b8f58b3da812f33406ae3b1858809c3c0b196..2e75e7c7317cb9c57cb3f36e38d9334f
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2564,6 +2565,7 @@ public class PurpurWorldConfig {
@@ -2566,6 +2567,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);

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 2e75e7c7317cb9c57cb3f36e38d9334fa7e9378a..29d09394eb6ee9fc7f412ffd9b0423b58a8b11fc 100644
index 12c84e3d9f702fa881ecb7e5de68391c9c4aec0f..e135bfd60a2b327b7a75a21f99a9d50cc89ec421 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -730,6 +730,11 @@ public class PurpurWorldConfig {
@@ -732,6 +732,11 @@ public class PurpurWorldConfig {
buddingAmethystSilkTouch = getBoolean("blocks.budding_amethyst.silk-touch", buddingAmethystSilkTouch);
}

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 497696a008d6508aee4f0facb36258af48c3fec2..ce5c9920d5b4f8cbd65d00db4e664e3fc847aabb 100644
index c57b344beaf4565fbf887b46008ccaf3ab70e970..26f6ab76a64c92650df8d69b877982fd133bb1db 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2762,5 +2762,28 @@ public class PurpurWorldConfig {
@@ -2764,5 +2764,28 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}

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 ce5c9920d5b4f8cbd65d00db4e664e3fc847aabb..f94960a51c983cf66efcfed7622c7c515ccada29 100644
index 26f6ab76a64c92650df8d69b877982fd133bb1db..e6984650f0c5aca4c78053f0ca1dfda2eb0efb45 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2785,5 +2785,16 @@ public class PurpurWorldConfig {
@@ -2787,5 +2787,16 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}

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 fc3847897170994bbd4e8908a6740a7030048dc8..3b2bfa5a72e4b0b5e6bb9e9f88645eda50877879 100644
index f959b938e55853275849950a30ab3d87aca1c9e8..574e53c1e58aee2c8159c3191b3ba7cff636447d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2114,6 +2114,7 @@ public class PurpurWorldConfig {
@@ -2116,6 +2116,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 fc3847897170994bbd4e8908a6740a7030048dc8..3b2bfa5a72e4b0b5e6bb9e9f88645eda
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2130,6 +2131,7 @@ public class PurpurWorldConfig {
@@ -2132,6 +2133,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);

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 12038651b988ec3b67feff352a494dc2a99b843a..db2a2a2845cf9155875d0ae1a11fce0dc2b6b4e7 100644
index 4ef41536c09c487a3f602896d39a3c090d56a6ab..3732b0e26885bf458befde37914a901bfb5ec0ea 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -690,6 +690,11 @@ public class PurpurWorldConfig {
@@ -692,6 +692,11 @@ public class PurpurWorldConfig {
anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);
}
@@ -60,7 +60,7 @@ index 12038651b988ec3b67feff352a494dc2a99b843a..db2a2a2845cf9155875d0ae1a11fce0d
public int beaconLevelOne = 20;
public int beaconLevelTwo = 30;
public int beaconLevelThree = 40;
@@ -819,6 +824,11 @@ public class PurpurWorldConfig {
@@ -821,6 +826,11 @@ public class PurpurWorldConfig {
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
}

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 95a643519ce3e4ef376acc2e8e2456595583db38..8eeeef68f436f2e6a215c2aae89a2da5ab602c80 100644
index f1295559db2833f6acaad9a3f0a3c42405eef1fc..3bfee9e6574a71ccd1ad13131ac9759f268e5129 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1198,6 +1198,7 @@ public class PurpurWorldConfig {
@@ -1200,6 +1200,7 @@ public class PurpurWorldConfig {
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 95a643519ce3e4ef376acc2e8e2456595583db38..8eeeef68f436f2e6a215c2aae89a2da5
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1212,6 +1213,7 @@ public class PurpurWorldConfig {
@@ -1214,6 +1215,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);

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 8eeeef68f436f2e6a215c2aae89a2da5ab602c80..e152a7a12566bb43e34f4cdd1f3c36a23b168c1e 100644
index 3bfee9e6574a71ccd1ad13131ac9759f268e5129..5d86e4dff7c77e379eb65a845efcd3521185c24f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1147,7 +1147,14 @@ public class PurpurWorldConfig {
@@ -1149,7 +1149,14 @@ public class PurpurWorldConfig {
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
public boolean cowTakeDamageFromWater = false;
@@ -77,7 +77,7 @@ index 8eeeef68f436f2e6a215c2aae89a2da5ab602c80..e152a7a12566bb43e34f4cdd1f3c36a2
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
cowControllable = getBoolean("mobs.cow.controllable", cowControllable);
@@ -1160,6 +1167,8 @@ public class PurpurWorldConfig {
@@ -1162,6 +1169,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);

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 e152a7a12566bb43e34f4cdd1f3c36a23b168c1e..56e64064e562caf69765e42781b83b9260db5f47 100644
index 5d86e4dff7c77e379eb65a845efcd3521185c24f..b66fcc5ca2bea4d67cc8355ca9adbe97111b44bc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -709,11 +709,13 @@ public class PurpurWorldConfig {
@@ -711,11 +711,13 @@ public class PurpurWorldConfig {
}
public boolean bedExplode = true;

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 56e64064e562caf69765e42781b83b9260db5f47..9b622b8682055f869e43d5c37a9dd555871624f9 100644
index b66fcc5ca2bea4d67cc8355ca9adbe97111b44bc..749eede2d0360195fb6c93a09c49406399499929 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1540,6 +1540,13 @@ public class PurpurWorldConfig {
@@ -1542,6 +1542,13 @@ public class PurpurWorldConfig {
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
}

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 9b622b8682055f869e43d5c37a9dd555871624f9..77d5ad2985eb0f3d4a75f6129b4d44a81b637861 100644
index 749eede2d0360195fb6c93a09c49406399499929..ebe19dd2bcb419d961bb45558e064ed915b3d91e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -752,6 +752,11 @@ public class PurpurWorldConfig {
@@ -754,6 +754,11 @@ public class PurpurWorldConfig {
cactusBreaksFromSolidNeighbors = getBoolean("blocks.cactus.breaks-from-solid-neighbors", cactusBreaksFromSolidNeighbors);
}

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 f21fcef89306008af99b4ef086c87d5226689e5c..990918f2f48c5f035c1dc8d79cab2b8e6145cdbd 100644
index 6a76db843326eded6b2e476e4fc37520274a527f..d043d160af858523837deb06733c5f02df84402f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2762,6 +2762,7 @@ public class PurpurWorldConfig {
@@ -2764,6 +2764,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerTakeDamageFromWater = false;
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index f21fcef89306008af99b4ef086c87d5226689e5c..990918f2f48c5f035c1dc8d79cab2b8e
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2779,6 +2780,7 @@ public class PurpurWorldConfig {
@@ -2781,6 +2782,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);

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 dd4a639596e14e6293262839121e60dce42ffda9..567a33bd21c14e412dede5b25eb47c513e551565 100644
index f3f7f34209739014528d127cbc80b7e6a1b2435f..ed484f609766a15c6097ee782ddb97bff1f11456 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -922,8 +922,10 @@ public class PurpurWorldConfig {
@@ -924,8 +924,10 @@ public class PurpurWorldConfig {
}
public boolean signRightClickEdit = false;

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 567a33bd21c14e412dede5b25eb47c513e551565..adf9eb03b67404b8ae4734f24f2a3043bff59a39 100644
index ed484f609766a15c6097ee782ddb97bff1f11456..3e5e8345f1faefefb057da639213fcbcc4f32551 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -775,6 +775,11 @@ public class PurpurWorldConfig {
@@ -777,6 +777,11 @@ public class PurpurWorldConfig {
composterBulkProcess = getBoolean("blocks.composter.sneak-to-bulk-process", composterBulkProcess);
}
@@ -146,7 +146,7 @@ index 567a33bd21c14e412dede5b25eb47c513e551565..adf9eb03b67404b8ae4734f24f2a3043
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -869,6 +874,16 @@ public class PurpurWorldConfig {
@@ -871,6 +876,16 @@ public class PurpurWorldConfig {
mobsSpawnOnBlueIce = getBoolean("blocks.blue_ice.allow-mob-spawns", mobsSpawnOnBlueIce);
}
@@ -163,7 +163,7 @@ index 567a33bd21c14e412dede5b25eb47c513e551565..adf9eb03b67404b8ae4734f24f2a3043
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;
public int lavaSpeedNether = 10;
@@ -958,6 +973,16 @@ public class PurpurWorldConfig {
@@ -960,6 +975,16 @@ public class PurpurWorldConfig {
turtleEggsBypassMobGriefing = getBoolean("blocks.turtle_egg.bypass-mob-griefing", turtleEggsBypassMobGriefing);
}
@@ -180,7 +180,7 @@ index 567a33bd21c14e412dede5b25eb47c513e551565..adf9eb03b67404b8ae4734f24f2a3043
public boolean waterInfinite = true;
public int waterInfiniteRequiredSources = 2;
private void waterSources() {
@@ -965,6 +990,16 @@ public class PurpurWorldConfig {
@@ -967,6 +992,16 @@ public class PurpurWorldConfig {
waterInfiniteRequiredSources = getInt("blocks.water.infinite-required-sources", waterInfiniteRequiredSources);
}

File diff suppressed because it is too large Load Diff

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 b311a5837981a637bb88537a6c4a29dc9dbb6ce3..14de7d96cc795e1efb019ac27559e64dfffd7379 100644
index 181556574fc6eedd748cc69e421c41401bf8cf66..56d69ba8a16837c86276e5f4f6334b7d69767534 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2477,6 +2477,7 @@ public class PurpurWorldConfig {
@@ -2479,6 +2479,7 @@ public class PurpurWorldConfig {
public double spiderMaxHealth = 16.0D;
public boolean spiderTakeDamageFromWater = false;
public boolean spiderAlwaysDropExp = false;
@@ -50,7 +50,7 @@ index b311a5837981a637bb88537a6c4a29dc9dbb6ce3..14de7d96cc795e1efb019ac27559e64d
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -2489,6 +2490,7 @@ public class PurpurWorldConfig {
@@ -2491,6 +2492,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);

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 14de7d96cc795e1efb019ac27559e64dfffd7379..c8101600155a5e9ca9d04ec65a802c89253506ab 100644
index 56d69ba8a16837c86276e5f4f6334b7d69767534..c6b423ca7023cb65cbaf983b427979607510db67 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 14de7d96cc795e1efb019ac27559e64dfffd7379..c8101600155a5e9ca9d04ec65a802c89
private void toolSettings() {
axeStrippables.clear();
axeWaxables.clear();
@@ -693,6 +695,8 @@ public class PurpurWorldConfig {
@@ -695,6 +697,8 @@ public class PurpurWorldConfig {
});
hoeTillables.put(block, new Tillable(condition, into, drops));
});

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 c8101600155a5e9ca9d04ec65a802c89253506ab..c766d20c368a4d211557713c7690e6614d093d81 100644
index c6b423ca7023cb65cbaf983b427979607510db67..5dbdaeb306f6bde3f94921e1bd2b5e5eac0107f2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2270,6 +2270,7 @@ public class PurpurWorldConfig {
@@ -2272,6 +2272,7 @@ public class PurpurWorldConfig {
public boolean sheepBypassMobGriefing = false;
public boolean sheepTakeDamageFromWater = false;
public boolean sheepAlwaysDropExp = false;
@@ -29,7 +29,7 @@ index c8101600155a5e9ca9d04ec65a802c89253506ab..c766d20c368a4d211557713c7690e661
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -2284,6 +2285,7 @@ public class PurpurWorldConfig {
@@ -2286,6 +2287,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);

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 c766d20c368a4d211557713c7690e6614d093d81..b6fda4581fdd0b3e270e707b9b7e360c8715b15f 100644
index 5dbdaeb306f6bde3f94921e1bd2b5e5eac0107f2..2724dc07320191fd84aa5564742b35872b16705f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -970,11 +970,13 @@ public class PurpurWorldConfig {
@@ -972,11 +972,13 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleEggsBypassMobGriefing = false;

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 b6fda4581fdd0b3e270e707b9b7e360c8715b15f..34bd5886b9437f2906558a6cd0b8771c66073c41 100644
index 2724dc07320191fd84aa5564742b35872b16705f..323b2cae0ce30b9eae0bc94e3780d3e3ce71c1ff 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1258,6 +1258,7 @@ public class PurpurWorldConfig {
@@ -1260,6 +1260,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -40,7 +40,7 @@ index b6fda4581fdd0b3e270e707b9b7e360c8715b15f..34bd5886b9437f2906558a6cd0b8771c
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1275,6 +1276,7 @@ public class PurpurWorldConfig {
@@ -1277,6 +1278,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 b6fda4581fdd0b3e270e707b9b7e360c8715b15f..34bd5886b9437f2906558a6cd0b8771c
}
public boolean dolphinRidable = false;
@@ -2350,6 +2352,7 @@ public class PurpurWorldConfig {
@@ -2352,6 +2354,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -56,7 +56,7 @@ index b6fda4581fdd0b3e270e707b9b7e360c8715b15f..34bd5886b9437f2906558a6cd0b8771c
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2362,6 +2365,7 @@ public class PurpurWorldConfig {
@@ -2364,6 +2367,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 b6fda4581fdd0b3e270e707b9b7e360c8715b15f..34bd5886b9437f2906558a6cd0b8771c
}
public boolean skeletonHorseRidableInWater = true;
@@ -2889,6 +2893,7 @@ public class PurpurWorldConfig {
@@ -2891,6 +2895,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -72,7 +72,7 @@ index b6fda4581fdd0b3e270e707b9b7e360c8715b15f..34bd5886b9437f2906558a6cd0b8771c
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2907,6 +2912,7 @@ public class PurpurWorldConfig {
@@ -2909,6 +2914,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);

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 34bd5886b9437f2906558a6cd0b8771c66073c41..3cc593fd35e235d90eca15cb19304ad5b9d97866 100644
index 323b2cae0ce30b9eae0bc94e3780d3e3ce71c1ff..5fd6e5a151302f5da6fb80d48fabd8bf6f091e9a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1078,6 +1078,7 @@ public class PurpurWorldConfig {
@@ -1080,6 +1080,7 @@ public class PurpurWorldConfig {
public boolean beeCanWorkAtNight = false;
public boolean beeCanWorkInRain = false;
public boolean beeAlwaysDropExp = false;
@@ -28,7 +28,7 @@ index 34bd5886b9437f2906558a6cd0b8771c66073c41..3cc593fd35e235d90eca15cb19304ad5
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -1094,6 +1095,7 @@ public class PurpurWorldConfig {
@@ -1096,6 +1097,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);

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 3cc593fd35e235d90eca15cb19304ad5b9d97866..ab53d43d26e01cb7ea5725bbda8b0a8a708a086c 100644
index 5fd6e5a151302f5da6fb80d48fabd8bf6f091e9a..00658cb51ea67c41968dea1375dc177e609ddd69 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -841,6 +841,7 @@ public class PurpurWorldConfig {
@@ -843,6 +843,7 @@ public class PurpurWorldConfig {
public boolean farmlandTramplingDisabled = false;
public boolean farmlandTramplingOnlyPlayers = false;
public boolean farmlandTramplingFeatherFalling = false;
@@ -46,7 +46,7 @@ index 3cc593fd35e235d90eca15cb19304ad5b9d97866..ab53d43d26e01cb7ea5725bbda8b0a8a
private void farmlandSettings() {
farmlandBypassMobGriefing = getBoolean("blocks.farmland.bypass-mob-griefing", farmlandBypassMobGriefing);
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
@@ -848,6 +849,7 @@ public class PurpurWorldConfig {
@@ -850,6 +851,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);

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 7dcbf902937d05062f49f66ea6a09ec608111539..9b2e412c9ac86ee70923a521a12add9d68c3a37d 100644
index d9148ccbdca242a1e4f79e537bb61354eb8de642..ca0e906481d6871efa8b7261fcd88157ff1b5f6a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2009,6 +2009,8 @@ public class PurpurWorldConfig {
@@ -2011,6 +2011,8 @@ public class PurpurWorldConfig {
public boolean phantomFlamesOnSwoop = false;
public boolean phantomTakeDamageFromWater = false;
public boolean phantomAlwaysDropExp = false;
@@ -34,7 +34,7 @@ index 7dcbf902937d05062f49f66ea6a09ec608111539..9b2e412c9ac86ee70923a521a12add9d
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -2051,6 +2053,13 @@ public class PurpurWorldConfig {
@@ -2053,6 +2055,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);

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 9b2e412c9ac86ee70923a521a12add9d68c3a37d..dc68de4d0088d0aed6fd800fb22fdc93f90dc048 100644
index ca0e906481d6871efa8b7261fcd88157ff1b5f6a..ef79bfec7ce236cc8f5929e19c3d62f75c390b89 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2687,6 +2687,7 @@ public class PurpurWorldConfig {
@@ -2689,6 +2689,7 @@ public class PurpurWorldConfig {
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index 9b2e412c9ac86ee70923a521a12add9d68c3a37d..dc68de4d0088d0aed6fd800fb22fdc93
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2709,6 +2710,7 @@ public class PurpurWorldConfig {
@@ -2711,6 +2712,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);

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 dc68de4d0088d0aed6fd800fb22fdc93f90dc048..e1a72b0039a950ef66050e575b0557635dc6245b 100644
index ef79bfec7ce236cc8f5929e19c3d62f75c390b89..89c8829b7e579647bb2c7e3319a221bc5c1227f4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2688,6 +2688,8 @@ public class PurpurWorldConfig {
@@ -2690,6 +2690,8 @@ public class PurpurWorldConfig {
public boolean villagerAllowTrading = true;
public boolean villagerAlwaysDropExp = false;
public int villagerMinimumDemand = 0;
@@ -123,7 +123,7 @@ index dc68de4d0088d0aed6fd800fb22fdc93f90dc048..e1a72b0039a950ef66050e575b055763
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2711,6 +2713,17 @@ public class PurpurWorldConfig {
@@ -2713,6 +2715,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);

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 e1a72b0039a950ef66050e575b0557635dc6245b..b2696c960e413a53907ba2f20008ec2286dfc9e8 100644
index 89c8829b7e579647bb2c7e3319a221bc5c1227f4..30a9b11a7b4c423b03057a0f899e0a510a929043 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2690,6 +2690,7 @@ public class PurpurWorldConfig {
@@ -2692,6 +2692,7 @@ public class PurpurWorldConfig {
public int villagerMinimumDemand = 0;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
@@ -28,7 +28,7 @@ index e1a72b0039a950ef66050e575b0557635dc6245b..b2696c960e413a53907ba2f20008ec22
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2724,6 +2725,7 @@ public class PurpurWorldConfig {
@@ -2726,6 +2727,7 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);

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 b2696c960e413a53907ba2f20008ec2286dfc9e8..f90e847e1236bd5a67a6970f2273073c801e37f4 100644
index 30a9b11a7b4c423b03057a0f899e0a510a929043..2fc992873e56daa9525c980d62c973fa9775fb7c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -959,8 +959,10 @@ public class PurpurWorldConfig {
@@ -961,8 +961,10 @@ public class PurpurWorldConfig {
}
public boolean spawnerDeactivateByRedstone = false;

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 6b21494a7461c2a449b754248cf19d4da571e3e0..bbe4976f018132f5ec1b252e02c979153db0c176 100644
index 0477f4a04154bd5851b4b7b4c23545d6be79af1d..30b0b93e43713281f4fd7e7dc04e6b91a263dcbb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -706,8 +706,12 @@ public class PurpurWorldConfig {
@@ -708,8 +708,12 @@ public class PurpurWorldConfig {
}
public boolean anvilAllowColors = false;

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 bbe4976f018132f5ec1b252e02c979153db0c176..df789c60ac11f4076f6a2114adb3e825376a79bd 100644
index 30b0b93e43713281f4fd7e7dc04e6b91a263dcbb..f5db78c3ee2e18cec0dbe8dfa8da9aafce54c416 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -985,12 +985,14 @@ public class PurpurWorldConfig {
@@ -987,12 +987,14 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleEggsBypassMobGriefing = false;
public int turtleEggsRandomTickCrackChance = 500;

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 df789c60ac11f4076f6a2114adb3e825376a79bd..0ca90833b7fa9014c3aed712e1bf209094d7ab31 100644
index f5db78c3ee2e18cec0dbe8dfa8da9aafce54c416..b5eb0b642dff985ea14e7233e47b18568c1dba32 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1701,6 +1701,7 @@ public class PurpurWorldConfig {
@@ -1703,6 +1703,7 @@ public class PurpurWorldConfig {
public int horseBreedingTicks = 6000;
public boolean horseTakeDamageFromWater = false;
public boolean horseStandWithRider = true;
@@ -32,7 +32,7 @@ index df789c60ac11f4076f6a2114adb3e825376a79bd..0ca90833b7fa9014c3aed712e1bf2090
public boolean horseAlwaysDropExp = false;
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
@@ -1720,6 +1721,7 @@ public class PurpurWorldConfig {
@@ -1722,6 +1723,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);

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 0ca90833b7fa9014c3aed712e1bf209094d7ab31..7fe637bbfd3f376346e8a99adaf8060b255c6a4d 100644
index b5eb0b642dff985ea14e7233e47b18568c1dba32..7ead92409e1293d2786d42951a69c19cc8fefd16 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2703,6 +2703,8 @@ public class PurpurWorldConfig {
@@ -2705,6 +2705,8 @@ public class PurpurWorldConfig {
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
public boolean villagerDisplayTradeItem = true;
@@ -30,7 +30,7 @@ index 0ca90833b7fa9014c3aed712e1bf209094d7ab31..7fe637bbfd3f376346e8a99adaf8060b
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2738,6 +2740,8 @@ public class PurpurWorldConfig {
@@ -2740,6 +2742,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);

View File

@@ -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 7fe637bbfd3f376346e8a99adaf8060b255c6a4d..7203569790382a5cc9039fe358a25576093955c3 100644
index 7ead92409e1293d2786d42951a69c19cc8fefd16..f55a93e835909603ffa0ca496e61841c429f3bf9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -980,6 +980,11 @@ public class PurpurWorldConfig {
@@ -982,6 +982,11 @@ public class PurpurWorldConfig {
spongeAbsorbsLava = getBoolean("blocks.sponge.absorbs-lava", spongeAbsorbsLava);
}

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 7203569790382a5cc9039fe358a25576093955c3..152a991122d72ab60e5fee810185471a8f33c9d6 100644
index f55a93e835909603ffa0ca496e61841c429f3bf9..fc14078dc670f739be9b7f8a6fe1a89ee107624d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -916,6 +916,13 @@ public class PurpurWorldConfig {
@@ -918,6 +918,13 @@ public class PurpurWorldConfig {
pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit);
}

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 152a991122d72ab60e5fee810185471a8f33c9d6..5d5ae3fb7d2ce35505b57b2ce26b3536c4ac7da8 100644
index fc14078dc670f739be9b7f8a6fe1a89ee107624d..098fdaa887f116c6a163ae5345aea7edefe669d6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -885,9 +885,11 @@ public class PurpurWorldConfig {
@@ -887,9 +887,11 @@ public class PurpurWorldConfig {
public boolean mobsSpawnOnPackedIce = true;
public boolean mobsSpawnOnBlueIce = true;