mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@55a16d8 Fix Varint21FrameDecoder cached length buf usage PaperMC/Paper@e6e37ba Add api to resolve components (#7648) PaperMC/Paper@7168438 [ci skip] Rework workflows to support optional paperclip build (#8583) PaperMC/Paper@da230d5 More vanilla friendly methods to update trades (#8478) PaperMC/Paper@8aff07a Add /paper dumplisteners command (#8507) PaperMC/Paper@b8919a7 pr command action fixes (#8591) PaperMC/Paper@185fa48 Fix chest relooting mechanics (#8580) PaperMC/Paper@b4beac0 Fixes potential issues arising from optimizing getPlayerByUUID (#8585) PaperMC/Paper@f637b1a Fix async entity add due to fungus trees (#7626) PaperMC/Paper@414ea80 ItemStack damage API (#7801) PaperMC/Paper@d98c370 Add displayName methods for advancements (#8584) PaperMC/Paper@44bb599 Add Tick TemporalUnit (#5445) PaperMC/Paper@9f7eef8 Friction API (#6611) PaperMC/Paper@4048d3e Allow using degrees for ArmorStand rotations (#7847) PaperMC/Paper@f59c802 Schoolable Fish API (#7089) PaperMC/Paper@21b964a Added ability to control player's insomnia and phantoms spawning (#6500) PaperMC/Paper@f1583fc Add `/paper dumplisteners tofile` and increase detail of command output (#8592)
This commit is contained in:
@@ -110,7 +110,7 @@ index 861727f150f28a508d3b1c7067d410f0d696aa89..5b79d821e8b55c8876eadcbe811a2c05
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
index 0da192e78865b50f87de0d61ce1b39b1899cc954..67a121269eccfcdb71d15e67eab567b488276d83 100644
|
||||
index 4f69a641686c086245ecc0696a8fd3f75c6b50d1..c65fdafb5433fe592dc0061bef4c0afbc611ba13 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
|
||||
@@ -67,6 +67,11 @@ public class Cow extends Animal {
|
||||
@@ -395,7 +395,7 @@ index e3c20db7bd003bb63d5b1b296c7aa9d7302548c8..d5a029db2831ea817071830ba30d0f50
|
||||
|
||||
public void setHomePos(BlockPos pos) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
index ffe8f80cfe3bec8fe79415015f5290749fcb770e..dd514cbf2f03b688eb4d8cd49052f1775d3adebb 100644
|
||||
index 63d0754427a01fb2bd85b9bf9d6e63d533c6995b..c3264daf9af8c3299d6d2ed539d04a43c9bfce7b 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
|
||||
@@ -207,6 +207,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
|
||||
@@ -1069,7 +1069,7 @@ index 6236a557d2a73dff70141140f79faf851a2062f0..0d8495a73df5b1b6cd2c7e5cf18cb3eb
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
index 66b69f9c6cc5cbf235dce888623b6cea98695f6f..cfecf0322ea22b42fa83bafe3cd2f5d74f0d1311 100644
|
||||
index e9482ebe59cba4cea06392fe97b74e4fb70eceda..0eaa8119201cae52340a1a58700906eb96e2a99f 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||||
@@ -137,6 +137,11 @@ public class Zombie extends Monster {
|
||||
@@ -1085,7 +1085,7 @@ index 66b69f9c6cc5cbf235dce888623b6cea98695f6f..cfecf0322ea22b42fa83bafe3cd2f5d7
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
index 9ad16a0fc968b89863ad5ef442a2e178f3d9a52d..51fe59657b5b4608fc1528086c8692030d243a7a 100644
|
||||
index 4dcd0e8198a37df01678a62ada3d75d579c08cff..fd4e34549ff65d0ed82d3bc1e8b7067a53a33d4c 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
|
||||
@@ -118,6 +118,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
@@ -1165,7 +1165,7 @@ index 75db61c5aab66234b26f7899229ddca8896e2086..a44f9a59fbec146df95d89c26df12efb
|
||||
|
||||
public static AttributeSupplier.Builder createAttributes() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
index 73bb73cf0f0a20d0218f4080f547e279613f14bf..373f74742323367c7fa1984313c99c42c253cfa9 100644
|
||||
index 179e15adbb6a5999a24dc9bcb8dd51ca24c38bee..63b2d3635d3882d8e2e55659c99c0165603fdfc1 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
@@ -188,6 +188,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
@@ -1181,7 +1181,7 @@ index 73bb73cf0f0a20d0218f4080f547e279613f14bf..373f74742323367c7fa1984313c99c42
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
index 6cdb81ef8ca385f4346fd875a21c20c8153cb47b..767ec15ee2dcb421946795c58c3c0b2e3fb86fd4 100644
|
||||
index 3f3d7a36eb204114df4a535ef7f2afdcdd5201f7..bef536f773e662050b8d120d41e1c730aeedd447 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||||
@@ -91,6 +91,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||||
@@ -1197,7 +1197,7 @@ index 6cdb81ef8ca385f4346fd875a21c20c8153cb47b..767ec15ee2dcb421946795c58c3c0b2e
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087611a7219 100644
|
||||
index bfe540637ec08d098a3b9e951b2d88fd4f618f1a..2137335cac886ac967ad318f449b4992e666ba8c 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -572,11 +572,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1762,7 +1762,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean phantomRidable = false;
|
||||
@@ -1345,6 +1417,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1339,6 +1411,7 @@ public class PurpurWorldConfig {
|
||||
public boolean phantomIgnorePlayersWithTorch = false;
|
||||
public boolean phantomBurnInDaylight = true;
|
||||
public boolean phantomFlamesOnSwoop = false;
|
||||
@@ -1770,7 +1770,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void phantomSettings() {
|
||||
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
|
||||
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
|
||||
@@ -1385,6 +1458,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1373,6 +1446,7 @@ public class PurpurWorldConfig {
|
||||
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
|
||||
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
|
||||
phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
|
||||
@@ -1778,7 +1778,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean pigRidable = false;
|
||||
@@ -1393,6 +1467,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1381,6 +1455,7 @@ public class PurpurWorldConfig {
|
||||
public double pigMaxHealth = 10.0D;
|
||||
public boolean pigGiveSaddleBack = false;
|
||||
public int pigBreedingTicks = 6000;
|
||||
@@ -1786,7 +1786,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void pigSettings() {
|
||||
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
|
||||
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
|
||||
@@ -1405,6 +1480,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1393,6 +1468,7 @@ public class PurpurWorldConfig {
|
||||
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
|
||||
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
|
||||
pigBreedingTicks = getInt("mobs.pig.breeding-delay-ticks", pigBreedingTicks);
|
||||
@@ -1794,7 +1794,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean piglinRidable = false;
|
||||
@@ -1412,6 +1488,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1400,6 +1476,7 @@ public class PurpurWorldConfig {
|
||||
public boolean piglinControllable = true;
|
||||
public double piglinMaxHealth = 16.0D;
|
||||
public boolean piglinBypassMobGriefing = false;
|
||||
@@ -1802,7 +1802,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void piglinSettings() {
|
||||
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
|
||||
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
|
||||
@@ -1423,12 +1500,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1411,12 +1488,14 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
|
||||
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
|
||||
@@ -1817,7 +1817,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void piglinBruteSettings() {
|
||||
piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable);
|
||||
piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater);
|
||||
@@ -1439,6 +1518,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1427,6 +1506,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.piglin_brute.attributes.max_health", oldValue);
|
||||
}
|
||||
piglinBruteMaxHealth = getDouble("mobs.piglin_brute.attributes.max_health", piglinBruteMaxHealth);
|
||||
@@ -1825,7 +1825,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean pillagerRidable = false;
|
||||
@@ -1446,6 +1526,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1434,6 +1514,7 @@ public class PurpurWorldConfig {
|
||||
public boolean pillagerControllable = true;
|
||||
public double pillagerMaxHealth = 24.0D;
|
||||
public boolean pillagerBypassMobGriefing = false;
|
||||
@@ -1833,7 +1833,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void pillagerSettings() {
|
||||
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
|
||||
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
|
||||
@@ -1457,6 +1538,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1445,6 +1526,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
|
||||
pillagerBypassMobGriefing = getBoolean("mobs.pillager.bypass-mob-griefing", pillagerBypassMobGriefing);
|
||||
@@ -1841,7 +1841,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean polarBearRidable = false;
|
||||
@@ -1466,6 +1548,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1454,6 +1536,7 @@ public class PurpurWorldConfig {
|
||||
public String polarBearBreedableItemString = "";
|
||||
public Item polarBearBreedableItem = null;
|
||||
public int polarBearBreedingTicks = 6000;
|
||||
@@ -1849,7 +1849,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void polarBearSettings() {
|
||||
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
|
||||
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
|
||||
@@ -1480,11 +1563,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1468,11 +1551,13 @@ public class PurpurWorldConfig {
|
||||
Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
|
||||
if (item != Items.AIR) polarBearBreedableItem = item;
|
||||
polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
|
||||
@@ -1863,7 +1863,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void pufferfishSettings() {
|
||||
pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable);
|
||||
pufferfishControllable = getBoolean("mobs.pufferfish.controllable", pufferfishControllable);
|
||||
@@ -1494,6 +1579,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1482,6 +1567,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.pufferfish.attributes.max_health", oldValue);
|
||||
}
|
||||
pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth);
|
||||
@@ -1871,7 +1871,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean rabbitRidable = false;
|
||||
@@ -1504,6 +1590,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1492,6 +1578,7 @@ public class PurpurWorldConfig {
|
||||
public double rabbitNaturalKiller = 0.0D;
|
||||
public int rabbitBreedingTicks = 6000;
|
||||
public boolean rabbitBypassMobGriefing = false;
|
||||
@@ -1879,7 +1879,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void rabbitSettings() {
|
||||
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
|
||||
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
|
||||
@@ -1518,6 +1605,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1506,6 +1593,7 @@ public class PurpurWorldConfig {
|
||||
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
|
||||
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
|
||||
rabbitBypassMobGriefing = getBoolean("mobs.rabbit.bypass-mob-griefing", rabbitBypassMobGriefing);
|
||||
@@ -1887,7 +1887,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean ravagerRidable = false;
|
||||
@@ -1525,6 +1613,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1513,6 +1601,7 @@ public class PurpurWorldConfig {
|
||||
public boolean ravagerControllable = true;
|
||||
public double ravagerMaxHealth = 100.0D;
|
||||
public boolean ravagerBypassMobGriefing = false;
|
||||
@@ -1895,7 +1895,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void ravagerSettings() {
|
||||
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
|
||||
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
|
||||
@@ -1536,11 +1625,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1524,11 +1613,13 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
|
||||
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);
|
||||
@@ -1909,7 +1909,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void salmonSettings() {
|
||||
salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable);
|
||||
salmonControllable = getBoolean("mobs.salmon.controllable", salmonControllable);
|
||||
@@ -1550,6 +1641,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1538,6 +1629,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.salmon.attributes.max_health", oldValue);
|
||||
}
|
||||
salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth);
|
||||
@@ -1917,7 +1917,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean sheepRidable = false;
|
||||
@@ -1558,6 +1650,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1546,6 +1638,7 @@ public class PurpurWorldConfig {
|
||||
public double sheepMaxHealth = 8.0D;
|
||||
public int sheepBreedingTicks = 6000;
|
||||
public boolean sheepBypassMobGriefing = false;
|
||||
@@ -1925,7 +1925,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void sheepSettings() {
|
||||
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
|
||||
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
|
||||
@@ -1570,12 +1663,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1558,12 +1651,14 @@ public class PurpurWorldConfig {
|
||||
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
|
||||
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
|
||||
sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
|
||||
@@ -1940,7 +1940,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void shulkerSettings() {
|
||||
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
|
||||
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
|
||||
@@ -1586,6 +1681,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1574,6 +1669,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.shulker.attributes.max_health", oldValue);
|
||||
}
|
||||
shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
|
||||
@@ -1948,7 +1948,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean silverfishRidable = false;
|
||||
@@ -1593,6 +1689,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1581,6 +1677,7 @@ public class PurpurWorldConfig {
|
||||
public boolean silverfishControllable = true;
|
||||
public double silverfishMaxHealth = 8.0D;
|
||||
public boolean silverfishBypassMobGriefing = false;
|
||||
@@ -1956,7 +1956,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void silverfishSettings() {
|
||||
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
|
||||
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
|
||||
@@ -1604,12 +1701,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1592,12 +1689,14 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
|
||||
silverfishBypassMobGriefing = getBoolean("mobs.silverfish.bypass-mob-griefing", silverfishBypassMobGriefing);
|
||||
@@ -1971,7 +1971,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void skeletonSettings() {
|
||||
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
|
||||
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
|
||||
@@ -1620,6 +1719,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1608,6 +1707,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.skeleton.attributes.max_health", oldValue);
|
||||
}
|
||||
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
|
||||
@@ -1979,7 +1979,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean skeletonHorseRidableInWater = true;
|
||||
@@ -1630,6 +1730,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1618,6 +1718,7 @@ public class PurpurWorldConfig {
|
||||
public double skeletonHorseJumpStrengthMax = 1.0D;
|
||||
public double skeletonHorseMovementSpeedMin = 0.2D;
|
||||
public double skeletonHorseMovementSpeedMax = 0.2D;
|
||||
@@ -1987,7 +1987,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void skeletonHorseSettings() {
|
||||
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
|
||||
skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
|
||||
@@ -1645,6 +1746,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1633,6 +1734,7 @@ public class PurpurWorldConfig {
|
||||
skeletonHorseJumpStrengthMax = getDouble("mobs.skeleton_horse.attributes.jump_strength.max", skeletonHorseJumpStrengthMax);
|
||||
skeletonHorseMovementSpeedMin = getDouble("mobs.skeleton_horse.attributes.movement_speed.min", skeletonHorseMovementSpeedMin);
|
||||
skeletonHorseMovementSpeedMax = getDouble("mobs.skeleton_horse.attributes.movement_speed.max", skeletonHorseMovementSpeedMax);
|
||||
@@ -1995,7 +1995,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean slimeRidable = false;
|
||||
@@ -1654,6 +1756,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1642,6 +1744,7 @@ public class PurpurWorldConfig {
|
||||
public String slimeAttackDamage = "size";
|
||||
public Map<Integer, Double> slimeMaxHealthCache = new HashMap<>();
|
||||
public Map<Integer, Double> slimeAttackDamageCache = new HashMap<>();
|
||||
@@ -2003,7 +2003,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void slimeSettings() {
|
||||
slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable);
|
||||
slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater);
|
||||
@@ -1667,6 +1770,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1655,6 +1758,7 @@ public class PurpurWorldConfig {
|
||||
slimeAttackDamage = getString("mobs.slime.attributes.attack_damage", slimeAttackDamage);
|
||||
slimeMaxHealthCache.clear();
|
||||
slimeAttackDamageCache.clear();
|
||||
@@ -2011,7 +2011,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean snowGolemRidable = false;
|
||||
@@ -1681,6 +1785,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1669,6 +1773,7 @@ public class PurpurWorldConfig {
|
||||
public float snowGolemSnowBallModifier = 10.0F;
|
||||
public double snowGolemAttackDistance = 1.25D;
|
||||
public boolean snowGolemBypassMobGriefing = false;
|
||||
@@ -2019,7 +2019,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void snowGolemSettings() {
|
||||
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
|
||||
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
|
||||
@@ -1699,6 +1804,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1687,6 +1792,7 @@ public class PurpurWorldConfig {
|
||||
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
|
||||
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
|
||||
snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
|
||||
@@ -2027,7 +2027,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean squidRidable = false;
|
||||
@@ -1707,6 +1813,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1695,6 +1801,7 @@ public class PurpurWorldConfig {
|
||||
public boolean squidImmuneToEAR = true;
|
||||
public double squidOffsetWaterCheck = 0.0D;
|
||||
public boolean squidsCanFly = false;
|
||||
@@ -2035,7 +2035,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void squidSettings() {
|
||||
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
|
||||
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
|
||||
@@ -1719,12 +1826,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1707,12 +1814,14 @@ public class PurpurWorldConfig {
|
||||
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
|
||||
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
|
||||
squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
|
||||
@@ -2050,7 +2050,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void spiderSettings() {
|
||||
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
|
||||
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
|
||||
@@ -1735,12 +1844,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1723,12 +1832,14 @@ public class PurpurWorldConfig {
|
||||
set("mobs.spider.attributes.max_health", oldValue);
|
||||
}
|
||||
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
|
||||
@@ -2065,7 +2065,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void straySettings() {
|
||||
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
|
||||
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
|
||||
@@ -1751,6 +1862,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1739,6 +1850,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.stray.attributes.max_health", oldValue);
|
||||
}
|
||||
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
|
||||
@@ -2073,7 +2073,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean striderRidable = false;
|
||||
@@ -1759,6 +1871,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1747,6 +1859,7 @@ public class PurpurWorldConfig {
|
||||
public double striderMaxHealth = 20.0D;
|
||||
public int striderBreedingTicks = 6000;
|
||||
public boolean striderGiveSaddleBack = false;
|
||||
@@ -2081,7 +2081,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void striderSettings() {
|
||||
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
|
||||
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
|
||||
@@ -1771,6 +1884,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1759,6 +1872,7 @@ public class PurpurWorldConfig {
|
||||
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
|
||||
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
|
||||
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
|
||||
@@ -2089,7 +2089,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean tadpoleRidable = false;
|
||||
@@ -1792,6 +1906,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1780,6 +1894,7 @@ public class PurpurWorldConfig {
|
||||
public double traderLlamaMovementSpeedMin = 0.175D;
|
||||
public double traderLlamaMovementSpeedMax = 0.175D;
|
||||
public int traderLlamaBreedingTicks = 6000;
|
||||
@@ -2097,7 +2097,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void traderLlamaSettings() {
|
||||
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
|
||||
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
|
||||
@@ -1810,11 +1925,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1798,11 +1913,13 @@ public class PurpurWorldConfig {
|
||||
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
|
||||
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
|
||||
traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
|
||||
@@ -2111,7 +2111,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void tropicalFishSettings() {
|
||||
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
|
||||
tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
|
||||
@@ -1824,6 +1941,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1812,6 +1929,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.tropical_fish.attributes.max_health", oldValue);
|
||||
}
|
||||
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
|
||||
@@ -2119,7 +2119,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean turtleRidable = false;
|
||||
@@ -1831,6 +1949,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1819,6 +1937,7 @@ public class PurpurWorldConfig {
|
||||
public boolean turtleControllable = true;
|
||||
public double turtleMaxHealth = 30.0D;
|
||||
public int turtleBreedingTicks = 6000;
|
||||
@@ -2127,7 +2127,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void turtleSettings() {
|
||||
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
|
||||
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
|
||||
@@ -1842,6 +1961,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1830,6 +1949,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
|
||||
turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
|
||||
@@ -2135,7 +2135,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean vexRidable = false;
|
||||
@@ -1849,6 +1969,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1837,6 +1957,7 @@ public class PurpurWorldConfig {
|
||||
public boolean vexControllable = true;
|
||||
public double vexMaxY = 320D;
|
||||
public double vexMaxHealth = 14.0D;
|
||||
@@ -2143,7 +2143,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void vexSettings() {
|
||||
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
|
||||
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
|
||||
@@ -1860,6 +1981,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1848,6 +1969,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.vex.attributes.max_health", oldValue);
|
||||
}
|
||||
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
|
||||
@@ -2151,7 +2151,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean villagerRidable = false;
|
||||
@@ -1875,6 +1997,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1863,6 +1985,7 @@ public class PurpurWorldConfig {
|
||||
public boolean villagerClericsFarmWarts = false;
|
||||
public boolean villagerClericFarmersThrowWarts = true;
|
||||
public boolean villagerBypassMobGriefing = false;
|
||||
@@ -2159,7 +2159,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1894,6 +2017,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1882,6 +2005,7 @@ public class PurpurWorldConfig {
|
||||
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
|
||||
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
|
||||
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
|
||||
@@ -2167,7 +2167,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean vindicatorRidable = false;
|
||||
@@ -1901,6 +2025,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1889,6 +2013,7 @@ public class PurpurWorldConfig {
|
||||
public boolean vindicatorControllable = true;
|
||||
public double vindicatorMaxHealth = 24.0D;
|
||||
public double vindicatorJohnnySpawnChance = 0D;
|
||||
@@ -2175,7 +2175,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void vindicatorSettings() {
|
||||
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
|
||||
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
|
||||
@@ -1912,6 +2037,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1900,6 +2025,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
|
||||
vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
|
||||
@@ -2183,7 +2183,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean wanderingTraderRidable = false;
|
||||
@@ -1920,6 +2046,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1908,6 +2034,7 @@ public class PurpurWorldConfig {
|
||||
public double wanderingTraderMaxHealth = 20.0D;
|
||||
public boolean wanderingTraderFollowEmeraldBlock = false;
|
||||
public boolean wanderingTraderCanBeLeashed = false;
|
||||
@@ -2191,7 +2191,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void wanderingTraderSettings() {
|
||||
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
|
||||
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
|
||||
@@ -1932,6 +2059,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1920,6 +2047,7 @@ public class PurpurWorldConfig {
|
||||
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
|
||||
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
|
||||
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
|
||||
@@ -2199,7 +2199,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean wardenRidable = false;
|
||||
@@ -1947,6 +2075,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1935,6 +2063,7 @@ public class PurpurWorldConfig {
|
||||
public boolean witchRidableInWater = false;
|
||||
public boolean witchControllable = true;
|
||||
public double witchMaxHealth = 26.0D;
|
||||
@@ -2207,7 +2207,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void witchSettings() {
|
||||
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
|
||||
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
|
||||
@@ -1957,6 +2086,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1945,6 +2074,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.witch.attributes.max_health", oldValue);
|
||||
}
|
||||
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
|
||||
@@ -2215,7 +2215,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean witherRidable = false;
|
||||
@@ -1967,6 +2097,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1955,6 +2085,7 @@ public class PurpurWorldConfig {
|
||||
public float witherHealthRegenAmount = 1.0f;
|
||||
public int witherHealthRegenDelay = 20;
|
||||
public boolean witherBypassMobGriefing = false;
|
||||
@@ -2223,7 +2223,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void witherSettings() {
|
||||
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
|
||||
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
|
||||
@@ -1985,12 +2116,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1973,12 +2104,14 @@ public class PurpurWorldConfig {
|
||||
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
|
||||
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
|
||||
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
|
||||
@@ -2238,7 +2238,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void witherSkeletonSettings() {
|
||||
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
|
||||
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
|
||||
@@ -2001,6 +2134,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1989,6 +2122,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.wither_skeleton.attributes.max_health", oldValue);
|
||||
}
|
||||
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
|
||||
@@ -2246,7 +2246,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean wolfRidable = false;
|
||||
@@ -2011,6 +2145,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1999,6 +2133,7 @@ public class PurpurWorldConfig {
|
||||
public boolean wolfMilkCuresRabies = true;
|
||||
public double wolfNaturalRabid = 0.0D;
|
||||
public int wolfBreedingTicks = 6000;
|
||||
@@ -2254,7 +2254,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void wolfSettings() {
|
||||
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
|
||||
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
|
||||
@@ -2029,12 +2164,14 @@ public class PurpurWorldConfig {
|
||||
@@ -2017,12 +2152,14 @@ public class PurpurWorldConfig {
|
||||
wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
|
||||
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
|
||||
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
|
||||
@@ -2269,7 +2269,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void zoglinSettings() {
|
||||
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
|
||||
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
|
||||
@@ -2045,6 +2182,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2033,6 +2170,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.zoglin.attributes.max_health", oldValue);
|
||||
}
|
||||
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
|
||||
@@ -2277,7 +2277,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean zombieRidable = false;
|
||||
@@ -2057,6 +2195,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2045,6 +2183,7 @@ public class PurpurWorldConfig {
|
||||
public boolean zombieJockeyTryExistingChickens = true;
|
||||
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
|
||||
public boolean zombieBypassMobGriefing = false;
|
||||
@@ -2285,7 +2285,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void zombieSettings() {
|
||||
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
|
||||
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
|
||||
@@ -2073,6 +2212,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2061,6 +2200,7 @@ public class PurpurWorldConfig {
|
||||
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
|
||||
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
|
||||
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
|
||||
@@ -2293,7 +2293,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean zombieHorseRidableInWater = false;
|
||||
@@ -2084,6 +2224,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2072,6 +2212,7 @@ public class PurpurWorldConfig {
|
||||
public double zombieHorseMovementSpeedMin = 0.2D;
|
||||
public double zombieHorseMovementSpeedMax = 0.2D;
|
||||
public double zombieHorseSpawnChance = 0.0D;
|
||||
@@ -2301,7 +2301,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void zombieHorseSettings() {
|
||||
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
|
||||
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
|
||||
@@ -2100,6 +2241,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2088,6 +2229,7 @@ public class PurpurWorldConfig {
|
||||
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
|
||||
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
|
||||
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
|
||||
@@ -2309,7 +2309,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean zombieVillagerRidable = false;
|
||||
@@ -2110,6 +2252,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2098,6 +2240,7 @@ public class PurpurWorldConfig {
|
||||
public boolean zombieVillagerJockeyOnlyBaby = true;
|
||||
public double zombieVillagerJockeyChance = 0.05D;
|
||||
public boolean zombieVillagerJockeyTryExistingChickens = true;
|
||||
@@ -2317,7 +2317,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void zombieVillagerSettings() {
|
||||
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
|
||||
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
|
||||
@@ -2124,6 +2267,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2112,6 +2255,7 @@ public class PurpurWorldConfig {
|
||||
zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
|
||||
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
|
||||
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
|
||||
@@ -2325,7 +2325,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
}
|
||||
|
||||
public boolean zombifiedPiglinRidable = false;
|
||||
@@ -2135,6 +2279,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2123,6 +2267,7 @@ public class PurpurWorldConfig {
|
||||
public double zombifiedPiglinJockeyChance = 0.05D;
|
||||
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
|
||||
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
|
||||
@@ -2333,7 +2333,7 @@ index 4e996becabad942aaaa5ccb097707b0e2fd83adb..7862f9ff2b5179751949a0efedc03087
|
||||
private void zombifiedPiglinSettings() {
|
||||
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
|
||||
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
|
||||
@@ -2150,5 +2295,6 @@ public class PurpurWorldConfig {
|
||||
@@ -2138,5 +2283,6 @@ public class PurpurWorldConfig {
|
||||
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
|
||||
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
|
||||
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
|
||||
|
||||
Reference in New Issue
Block a user