Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions patches/server/0004-Purpur-config-files.patch
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ index 061716934ba0a1f01e4d85d664034f72b3c7a765..acd95cf1dc7f009b63e44e4404e17362
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
index dd0143f319d4adef8834c513af34b1cce7a94a84..40f6d9845d2405c6e54c5213618e1b21016e3d3f 100644
index 0d140dd7d55407b57fc3394ceb2eba5136e4fcaf..ed64b78bc8510fbe8fda9a10b779e91d99313676 100644
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
@@ -318,6 +318,30 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
Expand Down Expand Up @@ -351,10 +351,10 @@ index 0000000000000000000000000000000000000000..5907e78bb059bca4a63ea8043d0be730
+}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..98784ef305393ba90ca54efde363b2fea5757b3d
index 0000000000000000000000000000000000000000..b1628149a2f3effebbf86fd5615f1c8c1d0fbe73
--- /dev/null
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -0,0 +1,94 @@
@@ -0,0 +1,95 @@
+package org.purpurmc.purpur;
+
+import gg.pufferfish.pufferfish.PufferfishConfig;
Expand All @@ -370,6 +370,7 @@ index 0000000000000000000000000000000000000000..98784ef305393ba90ca54efde363b2fe
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.properties.Tilt;
+import org.purpurmc.purpur.entity.GlowSquidColor;
+import org.purpurmc.purpur.tool.Strippable;
+import org.purpurmc.purpur.tool.Tillable;
+import org.purpurmc.purpur.tool.Waxable;
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0008-Ridables.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5236,10 +5236,10 @@ index 5907e78bb059bca4a63ea8043d0be730412d9c13..b5d8d9475e563a77c9a7923fc4e780e0
+ }
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 98784ef305393ba90ca54efde363b2fea5757b3d..3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7 100644
index b1628149a2f3effebbf86fd5615f1c8c1d0fbe73..c2e8eb6b25b21ea3238c5df180e4deb8d59ab5b2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -91,4 +91,706 @@ public class PurpurWorldConfig {
@@ -92,4 +92,706 @@ public class PurpurWorldConfig {
final Map<String, Object> value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null);
return value.isEmpty() ? fallback : value;
}
Expand Down
16 changes: 8 additions & 8 deletions patches/server/0009-Configurable-entity-base-attributes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1464,10 +1464,10 @@ index 2ae9a5da91ad20f1b566a686dcc8d4f14c62ecc5..8bfa041297db79e8f1452ce7059d1536

@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bcb54df073 100644
index c2e8eb6b25b21ea3238c5df180e4deb8d59ab5b2..b411ba7283b8d6abf7cf53c3c82b612c801ebbee 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -112,94 +112,166 @@ public class PurpurWorldConfig {
@@ -113,94 +113,166 @@ public class PurpurWorldConfig {

public boolean axolotlRidable = false;
public boolean axolotlControllable = true;
Expand Down Expand Up @@ -1634,7 +1634,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
}

public boolean dolphinRidable = false;
@@ -207,80 +279,161 @@ public class PurpurWorldConfig {
@@ -208,80 +280,161 @@ public class PurpurWorldConfig {
public int dolphinSpitCooldown = 20;
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
Expand Down Expand Up @@ -1796,7 +1796,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
}

public boolean frogRidable = false;
@@ -298,147 +451,316 @@ public class PurpurWorldConfig {
@@ -299,147 +452,316 @@ public class PurpurWorldConfig {
public boolean ghastRidableInWater = false;
public boolean ghastControllable = true;
public double ghastMaxY = 320D;
Expand Down Expand Up @@ -2113,7 +2113,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
}

public boolean phantomRidable = false;
@@ -448,6 +770,10 @@ public class PurpurWorldConfig {
@@ -449,6 +771,10 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
Expand All @@ -2124,7 +2124,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -456,180 +782,350 @@ public class PurpurWorldConfig {
@@ -457,180 +783,350 @@ public class PurpurWorldConfig {
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
Expand Down Expand Up @@ -2475,7 +2475,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
}

public boolean tadpoleRidable = false;
@@ -644,64 +1140,125 @@ public class PurpurWorldConfig {
@@ -645,64 +1141,125 @@ public class PurpurWorldConfig {
public boolean traderLlamaRidable = false;
public boolean traderLlamaRidableInWater = false;
public boolean traderLlamaControllable = true;
Expand Down Expand Up @@ -2601,7 +2601,7 @@ index 3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7..6255b208de609d4e0331d611c2f0c7bc
}

public boolean wardenRidable = false;
@@ -716,81 +1273,165 @@ public class PurpurWorldConfig {
@@ -717,81 +1274,165 @@ public class PurpurWorldConfig {
public boolean witchRidable = false;
public boolean witchRidableInWater = false;
public boolean witchControllable = true;
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0012-AFK-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ea2c76116d8328d2ba6e5e7cc2ed1464f43a8c82..c272fc856113ca2399832b4af7f1e94af9ebb3e2 100644
index b158f3add91becadd8faad67e20791f16b58583d..a5bedcf16df7665e428bbfabfac31403bbb759e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -522,10 +522,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
Expand Down Expand Up @@ -276,10 +276,10 @@ index 492fb7fc8452bb214566e1ca1ebfd0f3ee5fde9e..88b76a75623d306da3bb3d935e7598a9

public static int barrelRows = 3;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6255b208de609d4e0331d611c2f0c7bcb54df073..b9580396b99af75ae4895b09fd8f10a56d0f6046 100644
index b411ba7283b8d6abf7cf53c3c82b612c801ebbee..657dfaa9cf2990fcade8739d3e1c3f9e71e2d38d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -92,6 +92,24 @@ public class PurpurWorldConfig {
@@ -93,6 +93,24 @@ public class PurpurWorldConfig {
return value.isEmpty() ? fallback : value;
}

Expand Down
8 changes: 4 additions & 4 deletions patches/server/0019-Player-invulnerabilities.patch
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ index 2da8186b5f34b5cce97512f50323bee091d380ab..e09cfac18f2b952bb54ec75b04505024
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c272fc856113ca2399832b4af7f1e94af9ebb3e2..dee07e6f1d85f37f4dbb9cd0956d48f91bd39ca2 100644
index a5bedcf16df7665e428bbfabfac31403bbb759e1..e98b9b3c549b077a220b108f668e6ab8df966c2c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2963,5 +2963,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
Expand All @@ -146,10 +146,10 @@ index c272fc856113ca2399832b4af7f1e94af9ebb3e2..dee07e6f1d85f37f4dbb9cd0956d48f9
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b9580396b99af75ae4895b09fd8f10a56d0f6046..1aea97e220b088c145a2cfdcd44530649389ce86 100644
index 657dfaa9cf2990fcade8739d3e1c3f9e71e2d38d..8eaac4b3b7e999ec99785fa41463d8e18d25a277 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,8 @@ public class PurpurWorldConfig {
@@ -98,6 +98,8 @@ public class PurpurWorldConfig {
public boolean idleTimeoutCountAsSleeping = false;
public boolean idleTimeoutUpdateTabList = false;
public boolean idleTimeoutTargetPlayer = true;
Expand All @@ -158,7 +158,7 @@ index b9580396b99af75ae4895b09fd8f10a56d0f6046..1aea97e220b088c145a2cfdcd4453064
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -108,6 +110,8 @@ public class PurpurWorldConfig {
@@ -109,6 +111,8 @@ public class PurpurWorldConfig {
idleTimeoutCountAsSleeping = getBoolean("gameplay-mechanics.player.idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0021-Configurable-villager-brain-ticks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ index ef08ec3eb88ee1ab624e2bd38aaff5e8f97720f2..4cb1cf2b51f1c58e2600996f1d67dcef
this.getBrain().tick((ServerLevel) this.level, this); // Paper
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6bb51d0ec5d110c8a6690c1df25a730d50df0f72..707ebaa9568d2875ead797feccd80da1cb9fc6a2 100644
index 8eaac4b3b7e999ec99785fa41463d8e18d25a277..f6bbe6326b60de83ee79c749705edca4ce293a11 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1239,6 +1239,8 @@ public class PurpurWorldConfig {
@@ -1240,6 +1240,8 @@ public class PurpurWorldConfig {
public boolean villagerRidableInWater = false;
public boolean villagerControllable = true;
public double villagerMaxHealth = 20.0D;
Expand All @@ -48,7 +48,7 @@ index 6bb51d0ec5d110c8a6690c1df25a730d50df0f72..707ebaa9568d2875ead797feccd80da1
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1249,6 +1251,8 @@ public class PurpurWorldConfig {
@@ -1250,6 +1252,8 @@ public class PurpurWorldConfig {
set("mobs.villager.attributes.max_health", oldValue);
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0023-Silk-touch-spawners.patch
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ index 39bc91423c830d69eff1996881373296f322f06a..e0d8bd28576f16822a584f3514dbcb8f
int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15);

diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 707ebaa9568d2875ead797feccd80da1cb9fc6a2..cc194b3560229101fcf2836cbb950082d3d35397 100644
index f6bbe6326b60de83ee79c749705edca4ce293a11..a4d4ef2e390df3b1f4d88413bd67fa78e847f35b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,6 +114,38 @@ public class PurpurWorldConfig {
@@ -115,6 +115,38 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ index 7d25fb0fc64a4f559fe206198fde900afa06f258..1a12fee99a8b69fc6c01e1e217575c7c
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index cc194b3560229101fcf2836cbb950082d3d35397..b22e855393e5f3d3099db3bba60ad62c1163ca2b 100644
index a4d4ef2e390df3b1f4d88413bd67fa78e847f35b..8214b85d372c2cb16aa56791f158fc6a88e5a988 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -146,6 +146,15 @@ public class PurpurWorldConfig {
@@ -147,6 +147,15 @@ public class PurpurWorldConfig {
});
}

Expand Down
6 changes: 3 additions & 3 deletions patches/server/0028-Giants-AI-settings.patch
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ index c1c5e884f00398032196ee71b55b348fcfce21ce..ed032918fb33d60c2d60d4db9275dddf
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b22e855393e5f3d3099db3bba60ad62c1163ca2b..2cf4bab37d7789f9d22ae1d9edbdabbe8fa79ab5 100644
index 8214b85d372c2cb16aa56791f158fc6a88e5a988..ebea7fe95f5722eb526aa94787e899f9bbfe6e72 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -534,6 +534,10 @@ public class PurpurWorldConfig {
@@ -535,6 +535,10 @@ public class PurpurWorldConfig {
public double giantMovementSpeed = 0.5D;
public double giantAttackDamage = 50.0D;
public double giantMaxHealth = 100.0D;
Expand All @@ -134,7 +134,7 @@ index b22e855393e5f3d3099db3bba60ad62c1163ca2b..2cf4bab37d7789f9d22ae1d9edbdabbe
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -550,6 +554,10 @@ public class PurpurWorldConfig {
@@ -551,6 +555,10 @@ public class PurpurWorldConfig {
set("mobs.giant.attributes.max_health", oldValue);
}
giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth);
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0029-Zombie-horse-naturally-spawn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ index eab96c9b53cd608ff99cdad06721cd19e490ad14..6e6559b7edbabc000ac47617ab064e43
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3e86f0fa382a80250c9b9a0e97eb6544b597760d..3657c311c2be4c8f9f6c8816c885bce7ed621f0f 100644
index ebea7fe95f5722eb526aa94787e899f9bbfe6e72..c48312f89859787cdecf667becee866a10c88e3b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1457,6 +1457,7 @@ public class PurpurWorldConfig {
@@ -1458,6 +1458,7 @@ public class PurpurWorldConfig {
public double zombieHorseJumpStrengthMax = 1.0D;
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
+ public double zombieHorseSpawnChance = 0.0D;
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1472,6 +1473,7 @@ public class PurpurWorldConfig {
@@ -1473,6 +1474,7 @@ public class PurpurWorldConfig {
zombieHorseJumpStrengthMax = getDouble("mobs.zombie_horse.attributes.jump_strength.max", zombieHorseJumpStrengthMax);
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0030-Charged-creeper-naturally-spawn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ index bb9fc7f78514b434aba2de25f79fb3404eac4c72..5b20eea9dd51498842599579b2f105e5

@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 408f80e6046a45ff3f7526f603e5c68d222057d4..c14e710ca4137912978212d69b9dad78d5613f83 100644
index c48312f89859787cdecf667becee866a10c88e3b..c452a21f82d0b873eea4ec9ce80040e0e5f77fd8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -325,6 +325,7 @@ public class PurpurWorldConfig {
@@ -326,6 +326,7 @@ public class PurpurWorldConfig {
public boolean creeperRidableInWater = false;
public boolean creeperControllable = true;
public double creeperMaxHealth = 20.0D;
+ public double creeperChargedChance = 0.0D;
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -335,6 +336,7 @@ public class PurpurWorldConfig {
@@ -336,6 +337,7 @@ public class PurpurWorldConfig {
set("mobs.creeper.attributes.max_health", oldValue);
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ index eaf040f10e33fdfb57391b6e7bc6901c87270853..47dc84052f1fb0017ff2e608c3f6d8b9
int i = world.getRandom().nextInt(100);

diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c14e710ca4137912978212d69b9dad78d5613f83..ecc43e84b839d66a0636623708633a5a71b95127 100644
index c452a21f82d0b873eea4ec9ce80040e0e5f77fd8..c092ef4a028d7dc335077b6b741bd1991cb3e7ba 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -968,6 +968,8 @@ public class PurpurWorldConfig {
@@ -969,6 +969,8 @@ public class PurpurWorldConfig {
public boolean rabbitRidableInWater = false;
public boolean rabbitControllable = true;
public double rabbitMaxHealth = 3.0D;
Expand All @@ -50,7 +50,7 @@ index c14e710ca4137912978212d69b9dad78d5613f83..ecc43e84b839d66a0636623708633a5a
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -978,6 +980,8 @@ public class PurpurWorldConfig {
@@ -979,6 +981,8 @@ public class PurpurWorldConfig {
set("mobs.rabbit.attributes.max_health", oldValue);
}
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
Expand Down
Loading