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

Fix typo in config (mods -> mobs)

Browse Source
This commit is contained in:
William Blake Galbreath
2021-08-22 15:23:16 -05:00
parent ae93eb02b9
commit 8e42878d35
144 changed files with 504 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0005-Purpur-config-files.patch
View File

@@ -29,7 +29,7 @@ index f5d01bce4d5547b4aeca96b7962b2090f47ea541..b3e7a11adf333d412ffde82aca9c9848
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index cba14fd282d1294eba4581336c5e438484df76f9..a189ad563e6072cf34e47fa66e3638b9fa577c61 100644
index 5b4000d1f63e2b028e7a4450dcd084eb507f7f91..b294fa10dc0fa804b94757eaa3becb104f20565a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -118,6 +118,11 @@ public class PaperConfig {
@@ -123,7 +123,7 @@ index 496000e65ffd5df5ea23783341dac5e2b9b63d0c..d49e53404b77eedd24e9824ef5b16a8c
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..faa4ad6af45ce1ef62084194340c6789634bff5f
index 0000000000000000000000000000000000000000..6903706219a146146a213710a5f83af37f7f60b8
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,159 @@
@@ -190,8 +190,8 @@ index 0000000000000000000000000000000000000000..faa4ad6af45ce1ef62084194340c6789
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 18);
+ set("config-version", 18);
+ version = getInt("config-version", 19);
+ set("config-version", 19);
+
+ readConfig(PurpurConfig.class, null);
+ }

13
patches/server/0014-AFK-API.patch
View File

@@ -192,7 +192,7 @@ index 6a4e44dd8935018d1b5283761dfb8e855be62987..afe70b0d5bd98d05bbb7afc756108f09
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d7ed125553530e28644f5fb9c09f7a06eb79199a..439143a24ad57cf749544164fe3cd131df78ea01 100644
index e9c2ad24aea7861d8d3c1f8879f70e8fa514fa05..4451d9fca6dad1406b8da348e34d62123b0a08e5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -158,8 +158,16 @@ public class PurpurConfig {
@@ -213,10 +213,10 @@ index d7ed125553530e28644f5fb9c09f7a06eb79199a..439143a24ad57cf749544164fe3cd131
private static void timingsSettings() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3627b50dd3af5da225004cd3f8158fcbd30d8ea3..58b2f795b7018ac92fd72369bbe58d2f2c266adc 100644
index 3627b50dd3af5da225004cd3f8158fcbd30d8ea3..61a0bc8acff72431318bf8fe4f9d5018f85bacc5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -93,6 +93,19 @@ public class PurpurWorldConfig {
@@ -93,6 +93,24 @@ public class PurpurWorldConfig {
return value.isEmpty() ? fallback : value;
}
@@ -226,11 +226,16 @@ index 3627b50dd3af5da225004cd3f8158fcbd30d8ea3..58b2f795b7018ac92fd72369bbe58d2f
+ public boolean idleTimeoutUpdateTabList = false;
+ public boolean idleTimeoutTargetPlayer = true;
+ private void playerSettings() {
+ if (PurpurConfig.version < 19) {
+ boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
+ set("gameplay-mechanics.player.idle-timeout.mods-target", null);
+ set("gameplay-mechanics.player.idle-timeout.mobs-target", oldVal);
+ }
+ idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
+ idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
+ 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.mods-target", idleTimeoutTargetPlayer);
+ idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
+ }
+
public boolean babiesAreRidable = true;

11
patches/server/0022-Player-invulnerabilities.patch
View File

@@ -121,21 +121,22 @@ index 1bbb3f0658628ec36cd9e177df3acc07ef107428..3f8dc9192287d6eb3f966e0d8d4fdee8
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 58b2f795b7018ac92fd72369bbe58d2f2c266adc..613dd74b460c0bd15fc8fd4e78380a81aef5f800 100644
index 61a0bc8acff72431318bf8fe4f9d5018f85bacc5..c4b95b8afd575ce94202b9359884a220e9c649a9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -98,12 +98,16 @@ public class PurpurWorldConfig {
@@ -98,6 +98,8 @@ public class PurpurWorldConfig {
public boolean idleTimeoutCountAsSleeping = false;
public boolean idleTimeoutUpdateTabList = false;
public boolean idleTimeoutTargetPlayer = true;
+ public int playerSpawnInvulnerableTicks = 60;
+ public boolean playerInvulnerableWhileAcceptingResourcePack = false;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -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.mods-target", idleTimeoutTargetPlayer);
idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
+ playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
+ playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

6
patches/server/0024-Configurable-villager-brain-ticks.patch
View File

@@ -36,10 +36,10 @@ index 682feb6f3c109b0b3034f3942f7dfa73721d359b..1d0263c594a41ef01d33ebfbd31d8dad
if (!inactive) {
if (this.behaviorTick++ % this.activatedPriority == 0) // Airplane
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 613dd74b460c0bd15fc8fd4e78380a81aef5f800..a1d6a2235e6c8025c8f5516ccc69bae610eb9c72 100644
index c4b95b8afd575ce94202b9359884a220e9c649a9..a4abc312a9c173fb6a4374c97012abc43c801b7a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1071,6 +1071,8 @@ public class PurpurWorldConfig {
@@ -1076,6 +1076,8 @@ public class PurpurWorldConfig {
public boolean villagerRidable = false;
public boolean villagerRidableInWater = false;
public double villagerMaxHealth = 20.0D;
@@ -48,7 +48,7 @@ index 613dd74b460c0bd15fc8fd4e78380a81aef5f800..a1d6a2235e6c8025c8f5516ccc69bae6
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1080,6 +1082,8 @@ public class PurpurWorldConfig {
@@ -1085,6 +1087,8 @@ public class PurpurWorldConfig {
set("mobs.villager.attributes.max_health", oldValue);
}
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);

4
patches/server/0026-Silk-touch-spawners.patch
View File

@@ -138,10 +138,10 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63
return i;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a1d6a2235e6c8025c8f5516ccc69bae610eb9c72..c79cd57a169613d757a340270586611a935d04ae 100644
index a4abc312a9c173fb6a4374c97012abc43c801b7a..48670fd7e51c39e207d95059261c09d52f309db6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -110,6 +110,31 @@ public class PurpurWorldConfig {
@@ -115,6 +115,31 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

6
patches/server/0027-MC-168772-Fix-Add-turtle-egg-block-options.patch
View File

@@ -50,10 +50,10 @@ index fdb3ab919a78221605257ae82bfd026346ce2ffb..e98fc3c235f9160f1928a8afb0d7991a
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c79cd57a169613d757a340270586611a935d04ae..8ae4300efd411c71fe5aa17cce73faed81a4dca8 100644
index 48670fd7e51c39e207d95059261c09d52f309db6..feb378bf766ef967a55c429df27017b9065cfb0c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1066,7 +1066,10 @@ public class PurpurWorldConfig {
@@ -1071,7 +1071,10 @@ public class PurpurWorldConfig {
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
public double turtleMaxHealth = 30.0D;
@@ -65,7 +65,7 @@ index c79cd57a169613d757a340270586611a935d04ae..8ae4300efd411c71fe5aa17cce73faed
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1075,6 +1078,9 @@ public class PurpurWorldConfig {
@@ -1080,6 +1083,9 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);

6
patches/server/0031-Giants-AI-settings.patch
View File

@@ -120,10 +120,10 @@ index a8ffdc8810152d77668aad7bad15a00c4d194d4c..91e28c414545d2bbb4e2f22c516d0f68
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8ae4300efd411c71fe5aa17cce73faed81a4dca8..d43028de9ee9ad9d2ffa7ad09ab914ba6baa9da2 100644
index feb378bf766ef967a55c429df27017b9065cfb0c..1ed71d3251d526a6a454236b5b51c5d161d62f32 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -455,6 +455,10 @@ public class PurpurWorldConfig {
@@ -460,6 +460,10 @@ public class PurpurWorldConfig {
public double giantMovementSpeed = 0.5D;
public double giantAttackDamage = 50.0D;
public double giantMaxHealth = 100.0D;
@@ -134,7 +134,7 @@ index 8ae4300efd411c71fe5aa17cce73faed81a4dca8..d43028de9ee9ad9d2ffa7ad09ab914ba
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -470,6 +474,10 @@ public class PurpurWorldConfig {
@@ -475,6 +479,10 @@ public class PurpurWorldConfig {
set("mobs.giant.attributes.max_health", oldValue);
}
giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth);

6
patches/server/0032-Zombie-horse-naturally-spawn.patch
View File

@@ -28,10 +28,10 @@ index e38444328c0e3e6e5f4d51926bc58d9f0e0975ac..a667c540b85a4afbb1beece7decb5d0e
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
this.addEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d43028de9ee9ad9d2ffa7ad09ab914ba6baa9da2..838453200e76534768c4fdfa6066999fa2735349 100644
index 1ed71d3251d526a6a454236b5b51c5d161d62f32..e351703bf554425cf978297d90cc8d7ab7beb85c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1253,6 +1253,7 @@ public class PurpurWorldConfig {
@@ -1258,6 +1258,7 @@ public class PurpurWorldConfig {
public double zombieHorseJumpStrengthMax = 1.0D;
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
@@ -39,7 +39,7 @@ index d43028de9ee9ad9d2ffa7ad09ab914ba6baa9da2..838453200e76534768c4fdfa6066999f
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1268,6 +1269,7 @@ public class PurpurWorldConfig {
@@ -1273,6 +1274,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);

6
patches/server/0033-Charged-creeper-naturally-spawn.patch
View File

@@ -24,10 +24,10 @@ index b71a6af3c2d1ca2a946b23efb11b0e794840cf25..b2b3630a90c685b0a692efb9bf8bb111
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 838453200e76534768c4fdfa6066999fa2735349..9010b44f1625ad6dd2a26aec8690297d97e86535 100644
index e351703bf554425cf978297d90cc8d7ab7beb85c..d47db0fe25ac89c2f5040d7106d9e06b0d415c8a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -277,6 +277,7 @@ public class PurpurWorldConfig {
@@ -282,6 +282,7 @@ public class PurpurWorldConfig {
public boolean creeperRidable = false;
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
@@ -35,7 +35,7 @@ index 838453200e76534768c4fdfa6066999fa2735349..9010b44f1625ad6dd2a26aec8690297d
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -286,6 +287,7 @@ public class PurpurWorldConfig {
@@ -291,6 +292,7 @@ public class PurpurWorldConfig {
set("mobs.creeper.attributes.max_health", oldValue);
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);

6
patches/server/0034-Rabbit-naturally-spawn-toast-and-killer.patch
View File

@@ -38,10 +38,10 @@ index 587feda351efae19407cb9f23c6c1d42d5ed0cc9..e0ba1ef404c9f8ba1eae563b733d10d9
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9010b44f1625ad6dd2a26aec8690297d97e86535..6d5857703c17d3ce0ab068ac68ece962ed832d48 100644
index d47db0fe25ac89c2f5040d7106d9e06b0d415c8a..60319614be9696d80bbbc147e529ad662dec0460 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -831,6 +831,8 @@ public class PurpurWorldConfig {
@@ -836,6 +836,8 @@ public class PurpurWorldConfig {
public boolean rabbitRidable = false;
public boolean rabbitRidableInWater = false;
public double rabbitMaxHealth = 3.0D;
@@ -50,7 +50,7 @@ index 9010b44f1625ad6dd2a26aec8690297d97e86535..6d5857703c17d3ce0ab068ac68ece962
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -840,6 +842,8 @@ public class PurpurWorldConfig {
@@ -845,6 +847,8 @@ public class PurpurWorldConfig {
set("mobs.rabbit.attributes.max_health", oldValue);
}
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);

6
patches/server/0037-Tulips-change-fox-type.patch
View File

@@ -75,10 +75,10 @@ index 80749df5d00df415a1b9e7c0e8586625b6453ffb..406b6ed8084c18da1062d8e8049bdfff
// Paper start - Cancellable death event
protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6d5857703c17d3ce0ab068ac68ece962ed832d48..3a985697430f7c113fd3a292f8748809ed5519ae 100644
index 60319614be9696d80bbbc147e529ad662dec0460..523ce8f7fff9a98b6646d1035849faeb23ead5ae 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -425,6 +425,7 @@ public class PurpurWorldConfig {
@@ -430,6 +430,7 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
@@ -86,7 +86,7 @@ index 6d5857703c17d3ce0ab068ac68ece962ed832d48..3a985697430f7c113fd3a292f8748809
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -434,6 +435,7 @@ public class PurpurWorldConfig {
@@ -439,6 +440,7 @@ public class PurpurWorldConfig {
set("mobs.fox.attributes.max_health", oldValue);
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);

6
patches/server/0038-Breedable-Polar-Bears.patch
View File

@@ -59,10 +59,10 @@ index 18780fb268cabb47bb0deb84c44520831c1a762b..d39c88af3882a09ff1a06f9052d7b9b8
this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D));
this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3a985697430f7c113fd3a292f8748809ed5519ae..f397063f5772a60181f1517f05968245f6f75557 100644
index 523ce8f7fff9a98b6646d1035849faeb23ead5ae..a52c414ffc277c866e3d845202afea3672dc91b8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -807,6 +807,8 @@ public class PurpurWorldConfig {
@@ -812,6 +812,8 @@ public class PurpurWorldConfig {
public boolean polarBearRidable = false;
public boolean polarBearRidableInWater = false;
public double polarBearMaxHealth = 30.0D;
@@ -71,7 +71,7 @@ index 3a985697430f7c113fd3a292f8748809ed5519ae..f397063f5772a60181f1517f05968245
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -816,6 +818,9 @@ public class PurpurWorldConfig {
@@ -821,6 +823,9 @@ public class PurpurWorldConfig {
set("mobs.polar_bear.attributes.max_health", oldValue);
}
polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth);

6
patches/server/0039-Chickens-can-retaliate.patch
View File

@@ -51,10 +51,10 @@ index 9fe68301b9a6efd703fb9d2215a9cd3b2f017a4e..35cf6b9fb4d72df905d93bf52c02846b
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f397063f5772a60181f1517f05968245f6f75557..0002582bca86c13d014c5d4291241840ae5d70f9 100644
index a52c414ffc277c866e3d845202afea3672dc91b8..1c8560ac101cf418b3e65d537132c47be27eac92 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -237,6 +237,7 @@ public class PurpurWorldConfig {
@@ -242,6 +242,7 @@ public class PurpurWorldConfig {
public boolean chickenRidable = false;
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
@@ -62,7 +62,7 @@ index f397063f5772a60181f1517f05968245f6f75557..0002582bca86c13d014c5d4291241840
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -246,6 +247,7 @@ public class PurpurWorldConfig {
@@ -251,6 +252,7 @@ public class PurpurWorldConfig {
set("mobs.chicken.attributes.max_health", oldValue);
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);

6
patches/server/0041-Cat-spawning-options.patch
View File

@@ -49,10 +49,10 @@ index 4cab98b5e441a174482893d3d289bbafa1f7a5fc..fa3cdff99a16b67ed86c8f7940ffa139
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0ab41948063fff3de291f538334dd6e28027df74..f02872f45a6cdc55637a7aa55ca6886d08dc3576 100644
index 048fc7e4ac798e7e9b561558b25d74b81563b706..08fb29310cc26b5d45528a86c654029ae8fe1b12 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -214,6 +214,9 @@ public class PurpurWorldConfig {
@@ -219,6 +219,9 @@ public class PurpurWorldConfig {
public boolean catRidable = false;
public boolean catRidableInWater = false;
public double catMaxHealth = 10.0D;
@@ -62,7 +62,7 @@ index 0ab41948063fff3de291f538334dd6e28027df74..f02872f45a6cdc55637a7aa55ca6886d
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -223,6 +226,9 @@ public class PurpurWorldConfig {
@@ -228,6 +231,9 @@ public class PurpurWorldConfig {
set("mobs.cat.attributes.max_health", oldValue);
}
catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth);

6
patches/server/0043-Cows-eat-mushrooms.patch
View File

@@ -114,10 +114,10 @@ index bee82d5bf600cbeacfcede600e5606529af1435e..9da76357da891a70e20ad80f50873b3b
public Cow getBreedOffspring(ServerLevel world, AgeableMob entity) {
return (Cow) EntityType.COW.create((Level) world);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f02872f45a6cdc55637a7aa55ca6886d08dc3576..01b143bc15c553d2f7ee5dd87a3eb75913c9798b 100644
index 08fb29310cc26b5d45528a86c654029ae8fe1b12..9381e25068d1d75ccfa949307f9cd02794724af4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -276,6 +276,7 @@ public class PurpurWorldConfig {
@@ -281,6 +281,7 @@ public class PurpurWorldConfig {
public boolean cowRidable = false;
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
@@ -125,7 +125,7 @@ index f02872f45a6cdc55637a7aa55ca6886d08dc3576..01b143bc15c553d2f7ee5dd87a3eb759
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -285,6 +286,7 @@ public class PurpurWorldConfig {
@@ -290,6 +291,7 @@ public class PurpurWorldConfig {
set("mobs.cow.attributes.max_health", oldValue);
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);

6
patches/server/0045-Pigs-give-saddle-back.patch
View File

@@ -28,10 +28,10 @@ index f4a099e691dce3c57069e76d67859161b459098e..518d28dc0b5b8c04263c93a4347e4c97
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 01b143bc15c553d2f7ee5dd87a3eb75913c9798b..aec3017ebc2155e88939e43101fa9e958c9d2102 100644
index 9381e25068d1d75ccfa949307f9cd02794724af4..63b1858a91050ffc0720532ee872e7c458ec5a5d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -766,6 +766,7 @@ public class PurpurWorldConfig {
@@ -771,6 +771,7 @@ public class PurpurWorldConfig {
public boolean pigRidable = false;
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
@@ -39,7 +39,7 @@ index 01b143bc15c553d2f7ee5dd87a3eb75913c9798b..aec3017ebc2155e88939e43101fa9e95
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -775,6 +776,7 @@ public class PurpurWorldConfig {
@@ -780,6 +781,7 @@ public class PurpurWorldConfig {
set("mobs.pig.attributes.max_health", oldValue);
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);

6
patches/server/0046-Snowman-drop-and-put-back-pumpkin.patch
View File

@@ -32,10 +32,10 @@ index fcf3092ef1863f62d9e76a77c0299ce1495ca1b7..ee64f4084b25d77f1c25b76a5b7d90cd
this.forceDrops = false; // CraftBukkit
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index aec3017ebc2155e88939e43101fa9e958c9d2102..d88a99003b84663fe6a50884f03eb78921c02937 100644
index 63b1858a91050ffc0720532ee872e7c458ec5a5d..13aa04d07c9f345d62fbe673dfd69d96dc42078b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -997,6 +997,8 @@ public class PurpurWorldConfig {
@@ -1002,6 +1002,8 @@ public class PurpurWorldConfig {
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
public double snowGolemMaxHealth = 4.0D;
@@ -44,7 +44,7 @@ index aec3017ebc2155e88939e43101fa9e958c9d2102..d88a99003b84663fe6a50884f03eb789
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1007,6 +1009,8 @@ public class PurpurWorldConfig {
@@ -1012,6 +1014,8 @@ public class PurpurWorldConfig {
set("mobs.snow_golem.attributes.max_health", oldValue);
}
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);

6
patches/server/0047-Ender-dragon-always-drop-full-exp.patch
View File

@@ -18,10 +18,10 @@ index d3caa18f5de2d96eae691655dd13e83f82c61e0c..f637cd740ec3801ce1c387473b5c4ff6
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d88a99003b84663fe6a50884f03eb78921c02937..edc6dcba5e3f9331e0e451aafb8a6053e804c3d6 100644
index 13aa04d07c9f345d62fbe673dfd69d96dc42078b..36ac4fb4ab94a8287b0063dc21efba156d38acac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -379,6 +379,7 @@ public class PurpurWorldConfig {
@@ -384,6 +384,7 @@ public class PurpurWorldConfig {
public boolean enderDragonRidableInWater = false;
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
@@ -29,7 +29,7 @@ index d88a99003b84663fe6a50884f03eb78921c02937..edc6dcba5e3f9331e0e451aafb8a6053
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -393,6 +394,7 @@ public class PurpurWorldConfig {
@@ -398,6 +399,7 @@ public class PurpurWorldConfig {
set("mobs.ender_dragon.attributes.max_health", oldValue);
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);

4
patches/server/0048-Signs-editable-on-right-click.patch
View File

@@ -35,10 +35,10 @@ index 1844ea93f8cea420f01937f85ed17c0ec1bb8bf0..9e80ba8970cad91ea22ac701f76e1413
} else {
return InteractionResult.PASS;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index edc6dcba5e3f9331e0e451aafb8a6053e804c3d6..af8cee33ea6780c2447361354497fbb6d5ad4501 100644
index 36ac4fb4ab94a8287b0063dc21efba156d38acac..9541fa2198420001bb471f088be4d46020b0ae3f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -140,6 +140,11 @@ public class PurpurWorldConfig {
@@ -145,6 +145,11 @@ public class PurpurWorldConfig {
});
}

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

@@ -70,10 +70,10 @@ index 344d3a8c1162f1a4ab5fc2b7676680ddace46649..156a153abe59f86db7f942155d8a21de
@Override
public ClientboundBlockEntityDataPacket getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index af8cee33ea6780c2447361354497fbb6d5ad4501..a6576dda1c7d707be7492b4ab8b38f47f6e3a852 100644
index 9541fa2198420001bb471f088be4d46020b0ae3f..982f88df319a3ca239a7364baee22595157d4e43 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -140,8 +140,10 @@ public class PurpurWorldConfig {
@@ -145,8 +145,10 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0050-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@@ -18,10 +18,10 @@ index a242a80b16c7d074d52a52728646224b1a0091d4..ee5bc54e37e5ae120e846ddd2cae5ca3
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a6576dda1c7d707be7492b4ab8b38f47f6e3a852..9ce64a3d7a00877688f1e45a3961159cb35c8d9f 100644
index 982f88df319a3ca239a7364baee22595157d4e43..1a6c882a9c30c5970383ae14a8718cb5cfc66713 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -140,6 +140,11 @@ public class PurpurWorldConfig {
@@ -145,6 +145,11 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0052-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -20,10 +20,10 @@ index 68fe72f4248ddf6712a09565eaa083bf3afc1f58..fb629ebb9f63efa56ab8baebc30248e4
// CraftBukkit start - Call death event
org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 51f8045f4f607db3cf63d30fa6783257466a6022..a62fb62962617f3bc14e03b8b7c9f6fec3849c57 100644
index 0cc349ff27e2d0c4e9cbe239af7aca5a90e8cce3..56be4ffad744f8d7f55c89f29a208b0c0e8779a6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -202,6 +202,11 @@ public class PurpurWorldConfig {
@@ -207,6 +207,11 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0053-Option-to-toggle-milk-curing-bad-omen.patch
View File

@@ -28,10 +28,10 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a62fb62962617f3bc14e03b8b7c9f6fec3849c57..5b702afacaa7e45a5dea5c4b6ec5a583043c0b87 100644
index 56be4ffad744f8d7f55c89f29a208b0c0e8779a6..098ab1266df569f0b09088c481b34303f344ffd1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -203,8 +203,10 @@ public class PurpurWorldConfig {
@@ -208,8 +208,10 @@ public class PurpurWorldConfig {
}
public boolean disableDropsOnCrammingDeath = false;

4
patches/server/0059-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
View File

@@ -18,10 +18,10 @@ index c95eef8596fe3e1ca83e620a6c54b164c797cbe1..1e6a5404d767318de29184b3e3a2bc41
if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
this.spawnAtLocation(this.getPickupItem(), 0.1F);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5b702afacaa7e45a5dea5c4b6ec5a583043c0b87..a3a7a1e1352caefdadba0ba477f4f1f95a02b458 100644
index 098ab1266df569f0b09088c481b34303f344ffd1..12df67056e742916b9638ee1fce6f8b7dab2b3f2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -204,9 +204,11 @@ public class PurpurWorldConfig {
@@ -209,9 +209,11 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;

10
patches/server/0060-Add-enderman-and-creeper-griefing-controls.patch
View File

@@ -38,10 +38,10 @@ index b92a83cfd15cedf7cd68c26193e65c5f24d9a621..a36313c321f9057350a9edb8b0959fd4
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a3a7a1e1352caefdadba0ba477f4f1f95a02b458..7528f889f05ea5046ff02097d37c59f81d57ffe1 100644
index 12df67056e742916b9638ee1fce6f8b7dab2b3f2..b94165c34e4c809e3686253beae26c05c7c3a181 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -376,6 +376,7 @@ public class PurpurWorldConfig {
@@ -381,6 +381,7 @@ public class PurpurWorldConfig {
public boolean creeperRidableInWater = false;
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
@@ -49,7 +49,7 @@ index a3a7a1e1352caefdadba0ba477f4f1f95a02b458..7528f889f05ea5046ff02097d37c59f8
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -386,6 +387,7 @@ public class PurpurWorldConfig {
@@ -391,6 +392,7 @@ public class PurpurWorldConfig {
}
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
@@ -57,7 +57,7 @@ index a3a7a1e1352caefdadba0ba477f4f1f95a02b458..7528f889f05ea5046ff02097d37c59f8
}
public boolean dolphinRidable = false;
@@ -483,6 +485,7 @@ public class PurpurWorldConfig {
@@ -488,6 +490,7 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
@@ -65,7 +65,7 @@ index a3a7a1e1352caefdadba0ba477f4f1f95a02b458..7528f889f05ea5046ff02097d37c59f8
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -492,6 +495,7 @@ public class PurpurWorldConfig {
@@ -497,6 +500,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);

10
patches/server/0061-Villagers-follow-emerald-blocks.patch
View File

@@ -54,10 +54,10 @@ index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83
this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7528f889f05ea5046ff02097d37c59f81d57ffe1..8cebb48442e7a5ea76fe511927ed7a2f11c6a6d9 100644
index b94165c34e4c809e3686253beae26c05c7c3a181..a70ea41a56edf5a52c96feb0bdebccaee0b89f04 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1235,6 +1235,7 @@ public class PurpurWorldConfig {
@@ -1240,6 +1240,7 @@ public class PurpurWorldConfig {
public double villagerMaxHealth = 20.0D;
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
@@ -65,7 +65,7 @@ index 7528f889f05ea5046ff02097d37c59f81d57ffe1..8cebb48442e7a5ea76fe511927ed7a2f
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1246,6 +1247,7 @@ public class PurpurWorldConfig {
@@ -1251,6 +1252,7 @@ public class PurpurWorldConfig {
villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth);
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -73,7 +73,7 @@ index 7528f889f05ea5046ff02097d37c59f81d57ffe1..8cebb48442e7a5ea76fe511927ed7a2f
}
public boolean vindicatorRidable = false;
@@ -1265,6 +1267,7 @@ public class PurpurWorldConfig {
@@ -1270,6 +1272,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidable = false;
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index 7528f889f05ea5046ff02097d37c59f81d57ffe1..8cebb48442e7a5ea76fe511927ed7a2f
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1274,6 +1277,7 @@ public class PurpurWorldConfig {
@@ -1279,6 +1282,7 @@ public class PurpurWorldConfig {
set("mobs.wandering_trader.attributes.max_health", oldValue);
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);

10
patches/server/0062-Allow-leashing-villagers.patch
View File

@@ -49,10 +49,10 @@ index 393061e13375bf7a7ee57973b4abac83ffa15fa3..c48935d35a6141c41db22e3ec172d599
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8cebb48442e7a5ea76fe511927ed7a2f11c6a6d9..76e143f985c7b029a7f7115e2f51f8dfc9c9ac13 100644
index a70ea41a56edf5a52c96feb0bdebccaee0b89f04..af80a7d516fa5669fe7406ab3b07b39ee643928f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1236,6 +1236,7 @@ public class PurpurWorldConfig {
@@ -1241,6 +1241,7 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
@@ -60,7 +60,7 @@ index 8cebb48442e7a5ea76fe511927ed7a2f11c6a6d9..76e143f985c7b029a7f7115e2f51f8df
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1248,6 +1249,7 @@ public class PurpurWorldConfig {
@@ -1253,6 +1254,7 @@ public class PurpurWorldConfig {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
@@ -68,7 +68,7 @@ index 8cebb48442e7a5ea76fe511927ed7a2f11c6a6d9..76e143f985c7b029a7f7115e2f51f8df
}
public boolean vindicatorRidable = false;
@@ -1268,6 +1270,7 @@ public class PurpurWorldConfig {
@@ -1273,6 +1275,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderRidableInWater = false;
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
@@ -76,7 +76,7 @@ index 8cebb48442e7a5ea76fe511927ed7a2f11c6a6d9..76e143f985c7b029a7f7115e2f51f8df
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1278,6 +1281,7 @@ public class PurpurWorldConfig {
@@ -1283,6 +1286,7 @@ public class PurpurWorldConfig {
}
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);

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

@@ -18,10 +18,10 @@ index 949fa7099198fdd00a0626ff53f75f3f2cada7f4..8a6a0825e7d4cc42f4325d2882461065
for (int i = 0; i < 10; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 76e143f985c7b029a7f7115e2f51f8dfc9c9ac13..91ba2eed526a17c657df5e0636c79019d91f1432 100644
index af80a7d516fa5669fe7406ab3b07b39ee643928f..18a6cc3765813868e624b8be8bd02fb057354637 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1237,6 +1237,8 @@ public class PurpurWorldConfig {
@@ -1242,6 +1242,8 @@ public class PurpurWorldConfig {
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
@@ -30,7 +30,7 @@ index 76e143f985c7b029a7f7115e2f51f8dfc9c9ac13..91ba2eed526a17c657df5e0636c79019
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1250,6 +1252,8 @@ public class PurpurWorldConfig {
@@ -1255,6 +1257,8 @@ public class PurpurWorldConfig {
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);

4
patches/server/0064-Implement-infinite-lava.patch
View File

@@ -58,10 +58,10 @@ index 695783e64564b1d2a178d57a89737d2a97ab9014..cd1a33a1f10d04a91358f51d736bda34
protected boolean canConvertToSource() {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 91ba2eed526a17c657df5e0636c79019d91f1432..74f2f991612f409d97ea855dc1039f0eef73088d 100644
index 18a6cc3765813868e624b8be8bd02fb057354637..13721c931f7763a9a9d60896f6d8b2e54122f9c7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -216,6 +216,13 @@ public class PurpurWorldConfig {
@@ -221,6 +221,13 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0065-Make-lava-flow-speed-configurable.patch
View File

@@ -18,10 +18,10 @@ index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 74f2f991612f409d97ea855dc1039f0eef73088d..6ef7cdf5e006c027e5316dffff5931607b79243f 100644
index 13721c931f7763a9a9d60896f6d8b2e54122f9c7..3e12ddad6dc848a82a15b271314ce24788e7d402 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -218,9 +218,13 @@ public class PurpurWorldConfig {
@@ -223,9 +223,13 @@ public class PurpurWorldConfig {
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;

10
patches/server/0066-Add-player-death-exp-control-options.patch
View File

@@ -31,7 +31,7 @@ index d761865eabfc67651b0a2a92ad35fc236886b61d..3e04510519ca5d03eb16aab8b1094e24
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6ef7cdf5e006c027e5316dffff5931607b79243f..ff6d433b5b235948324d754297d837b955c924a1 100644
index 3e12ddad6dc848a82a15b271314ce24788e7d402..9c6554bb8633899466aab12a7cb9ea87dac95b73 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -167,6 +167,8 @@ public class PurpurWorldConfig {
@@ -41,10 +41,10 @@ index 6ef7cdf5e006c027e5316dffff5931607b79243f..ff6d433b5b235948324d754297d837b9
+ public String playerDeathExpDropEquation = "expLevel * 7";
+ public int playerDeathExpDropMax = 100;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -175,6 +177,8 @@ public class PurpurWorldConfig {
idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -180,6 +182,8 @@ public class PurpurWorldConfig {
idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
+ playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);

4
patches/server/0067-Configurable-void-damage-height-and-damage.patch
View File

@@ -31,10 +31,10 @@ index 6100efd3d5de767ecb257b2a1f4ccfb161e94522..c6cfc4f83ec5b67c62fbf82ef4b795c3
protected void updateSwingTime() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ff6d433b5b235948324d754297d837b955c924a1..07ba3537e107f100dc407d208133ac350acca741 100644
index 9c6554bb8633899466aab12a7cb9ea87dac95b73..313d977209b9cb972207cf2d4f63b5d4aadc7227 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -209,10 +209,14 @@ public class PurpurWorldConfig {
@@ -214,10 +214,14 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;

4
patches/server/0069-Dispenser-curse-of-binding-protection.patch
View File

@@ -43,10 +43,10 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..dba3b8e0671ee63ff077155a8964f3e2
// CraftBukkit start
Level world = pointer.getLevel();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 07ba3537e107f100dc407d208133ac350acca741..8ad94fd83461e2aefc1c48cc1c088754d48d81af 100644
index 313d977209b9cb972207cf2d4f63b5d4aadc7227..ee53de5106cc9f3caef95e13d85d4cbd89982012 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -219,6 +219,11 @@ public class PurpurWorldConfig {
@@ -224,6 +224,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

4
patches/server/0070-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -17,10 +17,10 @@ index 99124b70d82140b108d424a5206657efe94f184e..4688cfb6f24066d3034efcd6b4816ceb
} else {
return Boat.Status.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8ad94fd83461e2aefc1c48cc1c088754d48d81af..f5262421fd28a2fcdb50b6d5700d4586002ce923 100644
index ee53de5106cc9f3caef95e13d85d4cbd89982012..29f50b0144f28c03af1114bed4473b5bbcf34677 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -206,12 +206,14 @@ public class PurpurWorldConfig {
@@ -211,12 +211,14 @@ public class PurpurWorldConfig {
});
}

6
patches/server/0071-Mending-mends-most-damages-equipment-first.patch
View File

@@ -73,10 +73,10 @@ index d439e8ce87bf7da03683a336941c7673b8b166e4..955e482e4bc83f2b777cd2e4254c40be
Entry<EquipmentSlot, ItemStack> entry = getRandomItemWith(enchantment, entityliving);
return entry != null ? entry.getValue() : ItemStack.EMPTY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f5262421fd28a2fcdb50b6d5700d4586002ce923..ec4eacc03b51944eaaa92a6326bc059faa558750 100644
index 29f50b0144f28c03af1114bed4473b5bbcf34677..a5572f018bbc5f12d97a1466bd7e34f7999d99e8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -206,6 +206,7 @@ public class PurpurWorldConfig {
@@ -211,6 +211,7 @@ public class PurpurWorldConfig {
});
}
@@ -84,7 +84,7 @@ index f5262421fd28a2fcdb50b6d5700d4586002ce923..ec4eacc03b51944eaaa92a6326bc059f
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
@@ -213,6 +214,7 @@ public class PurpurWorldConfig {
@@ -218,6 +219,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
private void miscGameplayMechanicsSettings() {

20
patches/server/0078-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e5
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1ea0dda024 100644
index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e586f2592 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -520,6 +520,9 @@ public class PurpurWorldConfig {
@@ -525,6 +525,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1e
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -530,6 +533,9 @@ public class PurpurWorldConfig {
@@ -535,6 +538,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1e
}
public boolean elderGuardianRidable = false;
@@ -742,6 +748,9 @@ public class PurpurWorldConfig {
@@ -747,6 +753,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1e
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -752,6 +761,9 @@ public class PurpurWorldConfig {
@@ -757,6 +766,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1e
}
public boolean illusionerRidable = false;
@@ -1452,6 +1464,9 @@ public class PurpurWorldConfig {
@@ -1457,6 +1469,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1e
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1462,6 +1477,9 @@ public class PurpurWorldConfig {
@@ -1467,6 +1482,9 @@ public class PurpurWorldConfig {
}
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1e
}
public boolean zombieHorseRidableInWater = false;
@@ -1495,6 +1513,9 @@ public class PurpurWorldConfig {
@@ -1500,6 +1518,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1e
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1505,12 +1526,18 @@ public class PurpurWorldConfig {
@@ -1510,12 +1531,18 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -259,7 +259,7 @@ index 18463b61d54170c1cce788e2175789f030da644c..1e836e2a89679ae47e52fb4f6adc1d1e
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1521,5 +1548,8 @@ public class PurpurWorldConfig {
@@ -1526,5 +1553,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);

6
patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -258,10 +258,10 @@ index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc1736
private float speed = 0.1F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1e836e2a89679ae47e52fb4f6adc1d1ea0dda024..a7c05f027d27d3177ae827c23c95265ab9370d50 100644
index d2754ceb0d87dd844a5e325ee5a89b4e586f2592..62c257b28d921d36198f925170a9ea01ec2c63be 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -933,6 +933,9 @@ public class PurpurWorldConfig {
@@ -938,6 +938,9 @@ public class PurpurWorldConfig {
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
public double phantomMaxHealth = 20.0D;
@@ -271,7 +271,7 @@ index 1e836e2a89679ae47e52fb4f6adc1d1ea0dda024..a7c05f027d27d3177ae827c23c95265a
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -946,6 +949,9 @@ public class PurpurWorldConfig {
@@ -951,6 +954,9 @@ public class PurpurWorldConfig {
set("mobs.phantom.attributes.max_health", oldValue);
}
phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth);

6
patches/server/0080-Add-phantom-spawning-options.patch
View File

@@ -48,10 +48,10 @@ index 79504dc3448402e73b09c4232b1fd0488872cf68..300c9f136edace2babea4a574090b184
for (int l = 0; l < k; ++l) {
// Paper start
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a7c05f027d27d3177ae827c23c95265ab9370d50..9636d84a511473457d3cfa72bb953defc525568f 100644
index 62c257b28d921d36198f925170a9ea01ec2c63be..518925c8d6269161c439c7e87b8be108296fc301 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -936,6 +936,18 @@ public class PurpurWorldConfig {
@@ -941,6 +941,18 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -70,7 +70,7 @@ index a7c05f027d27d3177ae827c23c95265ab9370d50..9636d84a511473457d3cfa72bb953def
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -952,6 +964,18 @@ public class PurpurWorldConfig {
@@ -957,6 +969,18 @@ public class PurpurWorldConfig {
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);

4
patches/server/0081-Implement-bed-explosion-options.patch
View File

@@ -27,10 +27,10 @@ index 163a7861f987c3832aac51cc6df950c768546731..bf5765b6af9c7807d50f7daaacb5d524
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9636d84a511473457d3cfa72bb953defc525568f..b24e664207d503e1d458d2856198b376892edd95 100644
index 518925c8d6269161c439c7e87b8be108296fc301..3abfc7c8400ebebd81fab7206d5f86c61c48ed07 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -279,6 +279,22 @@ public class PurpurWorldConfig {
@@ -284,6 +284,22 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

4
patches/server/0082-Implement-respawn-anchor-explosion-options.patch
View File

@@ -18,10 +18,10 @@ index 0a5d563700c9f806139001181f01fa9d0111f792..1aae3d27ed6c0433312502a59fe1eb70
public static boolean canSetSpawn(Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b24e664207d503e1d458d2856198b376892edd95..059dad063ac6e9d9fc5713df54705ee65a683dc2 100644
index 3abfc7c8400ebebd81fab7206d5f86c61c48ed07..492156452dd6f91a3cd638ff8bbf88db458b5c12 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -316,6 +316,22 @@ public class PurpurWorldConfig {
@@ -321,6 +321,22 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

8
patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -55,7 +55,7 @@ index 93df077de01e88b97359d0409db9e3043cda902b..115dea3414f484897aa514f446b4d5e9
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fc521ed7418ce1dd53726f3621b68ccb01b1b3d2..da1e6d8571caea7c275c48f7eb20c7e698cb2640 100644
index f1de0689c36fbbc422a38b1692cba32ba48b155c..0e076eb9afad6b974d140d8f439e4d689d171eff 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -230,6 +230,7 @@ public class PurpurWorldConfig {
@@ -64,9 +64,9 @@ index fc521ed7418ce1dd53726f3621b68ccb01b1b3d2..da1e6d8571caea7c275c48f7eb20c7e6
public int playerDeathExpDropMax = 100;
+ public boolean teleportIfOutsideBorder = false;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -240,6 +241,7 @@ public class PurpurWorldConfig {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -245,6 +246,7 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);

6
patches/server/0087-Squid-EAR-immunity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index da1e6d8571caea7c275c48f7eb20c7e698cb2640..519968a57783008234fde804ba007c562d8b928c 100644
index 0e076eb9afad6b974d140d8f439e4d689d171eff..6264540a68771b03210bf7f91268aa08dde7c518 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1269,6 +1269,7 @@ public class PurpurWorldConfig {
@@ -1274,6 +1274,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
@@ -16,7 +16,7 @@ index da1e6d8571caea7c275c48f7eb20c7e698cb2640..519968a57783008234fde804ba007c56
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1277,6 +1278,7 @@ public class PurpurWorldConfig {
@@ -1282,6 +1283,7 @@ public class PurpurWorldConfig {
set("mobs.squid.attributes.max_health", oldValue);
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);

6
patches/server/0089-Phantoms-burn-in-light.patch
View File

@@ -47,10 +47,10 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff30
list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
Iterator iterator = list.iterator();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 519968a57783008234fde804ba007c562d8b928c..aad4ff0f251476d9f16d9571bd94701a1d998118 100644
index 6264540a68771b03210bf7f91268aa08dde7c518..9436b404d961368a66bbc94683bf0216b7a8b3f2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -987,6 +987,9 @@ public class PurpurWorldConfig {
@@ -992,6 +992,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -60,7 +60,7 @@ index 519968a57783008234fde804ba007c562d8b928c..aad4ff0f251476d9f16d9571bd94701a
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1015,6 +1018,9 @@ public class PurpurWorldConfig {
@@ -1020,6 +1023,9 @@ public class PurpurWorldConfig {
phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

6
patches/server/0090-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index 8a6a0825e7d4cc42f4325d2882461065b11a3202..1d03e936b696f3b7e88b411816a8195a
private boolean hungry() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index aad4ff0f251476d9f16d9571bd94701a1d998118..47220fd798b149e8dca436edbeeb9cfd495c1069 100644
index 9436b404d961368a66bbc94683bf0216b7a8b3f2..d0df471d0ad2df1590ee5bd41d77dd7fd1f1cff3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1412,6 +1412,7 @@ public class PurpurWorldConfig {
@@ -1417,6 +1417,7 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index aad4ff0f251476d9f16d9571bd94701a1d998118..47220fd798b149e8dca436edbeeb9cfd
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1427,6 +1428,7 @@ public class PurpurWorldConfig {
@@ -1432,6 +1433,7 @@ public class PurpurWorldConfig {
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);

4
patches/server/0091-Redstone-deactivates-spawners.patch
View File

@@ -17,10 +17,10 @@ index c601b8b12756682a4cb300be8ebed4319902c5b5..eec88d3947d435559d8ce175f72c5efb
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 47220fd798b149e8dca436edbeeb9cfd495c1069..42fef9385e626a01cad6b443a41ae989d74a6b32 100644
index d0df471d0ad2df1590ee5bd41d77dd7fd1f1cff3..140dfa7400b6b77596468f8777b8693af70d6094 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -346,6 +346,11 @@ public class PurpurWorldConfig {
@@ -351,6 +351,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

8
patches/server/0092-Totems-work-in-inventory.patch
View File

@@ -29,7 +29,7 @@ index 115dea3414f484897aa514f446b4d5e9810dd4d8..cb408accd66598017365aaa2693a57c2
event.setCancelled(itemstack == null);
this.level.getCraftServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 42fef9385e626a01cad6b443a41ae989d74a6b32..c22169ad9e4b2271e7083487beabd3ecf929ff75 100644
index 140dfa7400b6b77596468f8777b8693af70d6094..e56f0fca2faec53cc52a07878d4fbe9cff79b7c9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -231,6 +231,7 @@ public class PurpurWorldConfig {
@@ -38,9 +38,9 @@ index 42fef9385e626a01cad6b443a41ae989d74a6b32..c22169ad9e4b2271e7083487beabd3ec
public boolean teleportIfOutsideBorder = false;
+ public boolean totemOfUndyingWorksInInventory = false;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -242,6 +243,7 @@ public class PurpurWorldConfig {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -247,6 +248,7 @@ public class PurpurWorldConfig {
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);

6
patches/server/0093-Add-vindicator-johnny-spawn-chance.patch
View File

@@ -30,10 +30,10 @@ index 76e6ea34db3942e9dd7646ad7ca1259f4387a4d8..9096c40ad5784d9097e889f0f43b6cf1
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c22169ad9e4b2271e7083487beabd3ecf929ff75..209da7a5fc5a8fd44c3cebb8c2b528e004f76d92 100644
index e56f0fca2faec53cc52a07878d4fbe9cff79b7c9..ba43bed5bc2750f466243d2bf423d4caa053a85e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1441,6 +1441,7 @@ public class PurpurWorldConfig {
@@ -1446,6 +1446,7 @@ public class PurpurWorldConfig {
public boolean vindicatorRidable = false;
public boolean vindicatorRidableInWater = false;
public double vindicatorMaxHealth = 24.0D;
@@ -41,7 +41,7 @@ index c22169ad9e4b2271e7083487beabd3ecf929ff75..209da7a5fc5a8fd44c3cebb8c2b528e0
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1450,6 +1451,7 @@ public class PurpurWorldConfig {
@@ -1455,6 +1456,7 @@ public class PurpurWorldConfig {
set("mobs.vindicator.attributes.max_health", oldValue);
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);

4
patches/server/0095-Dispensers-place-anvils-option.patch
View File

@@ -41,10 +41,10 @@ index 0d34026a70c72661a9ba6b319690370e589714cc..da1465096178370494c8ed17bd8495f0
static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 209da7a5fc5a8fd44c3cebb8c2b528e004f76d92..f53dc9b42d0550f7e579dfa517be4448861d0b11 100644
index ba43bed5bc2750f466243d2bf423d4caa053a85e..d83383f98dd3d5766134137bbfdf0d973a925994 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -305,8 +305,10 @@ public class PurpurWorldConfig {
@@ -310,8 +310,10 @@ public class PurpurWorldConfig {
}
public boolean dispenserApplyCursedArmor = true;

4
patches/server/0096-Allow-anvil-colors.patch
View File

@@ -37,10 +37,10 @@ index ddfb89d62d2ec316683e9f0f5550e298ab26d137..410ac71efff92dfa1f1e11895d0f5bf3
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f53dc9b42d0550f7e579dfa517be4448861d0b11..3519a3cabf49c1af9cd80a1907d876a67dc0e15f 100644
index d83383f98dd3d5766134137bbfdf0d973a925994..3f780ac884e8037d155d402ba9a6807afb0d7a16 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -288,6 +288,11 @@ public class PurpurWorldConfig {
@@ -293,6 +293,11 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

4
patches/server/0097-Add-no-random-tick-block-list.patch
View File

@@ -35,10 +35,10 @@ index 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e5
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3519a3cabf49c1af9cd80a1907d876a67dc0e15f..aeca90b8df437130a2f6461398164e132e3ec634 100644
index 3f780ac884e8037d155d402ba9a6807afb0d7a16..d301176f1e755fbacc6b3145c0fe8f36a6764b7c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -288,6 +288,28 @@ public class PurpurWorldConfig {
@@ -293,6 +293,28 @@ public class PurpurWorldConfig {
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
}

6
patches/server/0098-Add-option-to-disable-dolphin-treasure-searching.patch
View File

@@ -17,10 +17,10 @@ index c372d47a929e06c8cfb0df86cf4e9bfee4d4b300..2aead13e8f879b614445715fb1912a20
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index aeca90b8df437130a2f6461398164e132e3ec634..de55bed5b04d18562c250568d61338be38015b2c 100644
index d301176f1e755fbacc6b3145c0fe8f36a6764b7c..a9388714c4bbe576dd0b4dd4f11a346d12d9f002 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -554,6 +554,7 @@ public class PurpurWorldConfig {
@@ -559,6 +559,7 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
@@ -28,7 +28,7 @@ index aeca90b8df437130a2f6461398164e132e3ec634..de55bed5b04d18562c250568d61338be
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -565,6 +566,7 @@ public class PurpurWorldConfig {
@@ -570,6 +571,7 @@ public class PurpurWorldConfig {
set("mobs.dolphin.attributes.max_health", oldValue);
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);

6
patches/server/0100-Stop-squids-floating-on-top-of-water.patch
View File

@@ -60,10 +60,10 @@ index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a
+ // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index de55bed5b04d18562c250568d61338be38015b2c..0ff8d202030da6e7f776619101db70afb2f5243e 100644
index a9388714c4bbe576dd0b4dd4f11a346d12d9f002..e59c9a2a4624ac89de30f486dac6d1aef3d914e5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1314,6 +1314,7 @@ public class PurpurWorldConfig {
@@ -1319,6 +1319,7 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
@@ -71,7 +71,7 @@ index de55bed5b04d18562c250568d61338be38015b2c..0ff8d202030da6e7f776619101db70af
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1323,6 +1324,7 @@ public class PurpurWorldConfig {
@@ -1328,6 +1329,7 @@ public class PurpurWorldConfig {
}
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);

6
patches/server/0103-Entities-can-use-portals-configuration.patch
View File

@@ -27,10 +27,10 @@ index 6bd301f998f66eb8c4f9cccac2f72f42be4c1b00..09f68cf24f813755b6e946e6c464a76f
public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0ff8d202030da6e7f776619101db70afb2f5243e..70d381322a05921a3766aca7f43ac28ba9bc98cc 100644
index e59c9a2a4624ac89de30f486dac6d1aef3d914e5..8ab851aedffa2a66a3ea948393f1ea56fade7150 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -274,6 +274,7 @@ public class PurpurWorldConfig {
@@ -279,6 +279,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
@@ -38,7 +38,7 @@ index 0ff8d202030da6e7f776619101db70afb2f5243e..70d381322a05921a3766aca7f43ac28b
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
@@ -282,6 +283,7 @@ public class PurpurWorldConfig {
@@ -287,6 +288,7 @@ public class PurpurWorldConfig {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);

6
patches/server/0105-Customizable-wither-health-and-healing.patch
View File

@@ -23,10 +23,10 @@ index 12cd1b453150e098975c34e00ec9277ff9730c75..ee13bdfb5cfc9992d26126804c0a0bb5
this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 70d381322a05921a3766aca7f43ac28ba9bc98cc..21133a596e586e6713ccec9c78fde6b07bcff3e0 100644
index 8ab851aedffa2a66a3ea948393f1ea56fade7150..ee548f39f3b0c32bd6abd673ea778e7c433bdf89 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1525,6 +1525,8 @@ public class PurpurWorldConfig {
@@ -1530,6 +1530,8 @@ public class PurpurWorldConfig {
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
public double witherMaxHealth = 300.0D;
@@ -35,7 +35,7 @@ index 70d381322a05921a3766aca7f43ac28ba9bc98cc..21133a596e586e6713ccec9c78fde6b0
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1539,6 +1541,8 @@ public class PurpurWorldConfig {
@@ -1544,6 +1546,8 @@ public class PurpurWorldConfig {
set("mobs.wither.attributes.max_health", oldValue);
}
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);

6
patches/server/0107-Raid-cooldown-setting.patch
View File

@@ -52,10 +52,10 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
if (!this.raidMap.containsKey(raid.getId())) {
this.raidMap.put(raid.getId(), raid);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 316469509ed3ff88229323c488e48b1fc439a0df..ef39747d7fea72a460aea674fbb10a602bbc8152 100644
index 3ea46e674461916261030bdd8b693789c34a324a..0d6e9f5f14d75c71f96da4b2ad7eb9d19fcf4254 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -300,6 +300,7 @@ public class PurpurWorldConfig {
@@ -305,6 +305,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -63,7 +63,7 @@ index 316469509ed3ff88229323c488e48b1fc439a0df..ef39747d7fea72a460aea674fbb10a60
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -309,6 +310,7 @@ public class PurpurWorldConfig {
@@ -314,6 +315,7 @@ public class PurpurWorldConfig {
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);

4
patches/server/0108-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -289,10 +289,10 @@ index 4a11f7417b438ee5711a720aca3321c88e970b2a..46b74271ce5f614f07754db14d2a552c
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ef39747d7fea72a460aea674fbb10a602bbc8152..aa4a3e84b3920676e1bdcfe3d12d7f77ea0868cf 100644
index 0d6e9f5f14d75c71f96da4b2ad7eb9d19fcf4254..bf4629ce5d098bd5c950071a810b841427a18fb7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -267,6 +267,35 @@ public class PurpurWorldConfig {
@@ -272,6 +272,35 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

6
patches/server/0109-Add-option-to-disable-zombie-aggressiveness-towards-.patch
View File

@@ -71,10 +71,10 @@ index 1f9a233799be988748f6146ced2a4489899079f8..1f90c40c5e92232c38a33097903fd6e2
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index aa4a3e84b3920676e1bdcfe3d12d7f77ea0868cf..7b555be4c241ffffed605ae73f8318b3443b7c46 100644
index bf4629ce5d098bd5c950071a810b841427a18fb7..1484f492df6366dec71aa1ced77ea6f8037675ca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1646,6 +1646,7 @@ public class PurpurWorldConfig {
@@ -1651,6 +1651,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index aa4a3e84b3920676e1bdcfe3d12d7f77ea0868cf..7b555be4c241ffffed605ae73f8318b3
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1659,6 +1660,7 @@ public class PurpurWorldConfig {
@@ -1664,6 +1665,7 @@ public class PurpurWorldConfig {
zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);

6
patches/server/0110-Persistent-TileEntity-Lore-and-DisplayName.patch
View File

@@ -189,10 +189,10 @@ index c3a07ccccd5cc38552363c82398f432c8d624288..132c9e6a643995d9fde535a78d9edc9e
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7b555be4c241ffffed605ae73f8318b3443b7c46..d32b008263ec45310320ae71457505432e1fbc85 100644
index 1484f492df6366dec71aa1ced77ea6f8037675ca..e1aab2eee7b3c3148f48417126bee94e91968033 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -326,6 +326,7 @@ public class PurpurWorldConfig {
@@ -331,6 +331,7 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -200,7 +200,7 @@ index 7b555be4c241ffffed605ae73f8318b3443b7c46..d32b008263ec45310320ae7145750543
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -336,6 +337,7 @@ public class PurpurWorldConfig {
@@ -341,6 +342,7 @@ public class PurpurWorldConfig {
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

8
patches/server/0112-Flying-squids-Oh-my.patch
View File

@@ -58,10 +58,10 @@ index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256
float f1 = Mth.cos(f) * 0.2F;
float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d32b008263ec45310320ae71457505432e1fbc85..33e2317646ca7b77537c8d52235f5a194717c439 100644
index e1aab2eee7b3c3148f48417126bee94e91968033..0653652a130841d15365d4843f864c3169c82e12 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -813,9 +813,11 @@ public class PurpurWorldConfig {
@@ -818,9 +818,11 @@ public class PurpurWorldConfig {
public boolean glowSquidRidable = false;
public double glowSquidMaxHealth = 10.0D;
@@ -73,7 +73,7 @@ index d32b008263ec45310320ae71457505432e1fbc85..33e2317646ca7b77537c8d52235f5a19
}
public boolean goatRidable = false;
@@ -1371,6 +1373,7 @@ public class PurpurWorldConfig {
@@ -1376,6 +1378,7 @@ public class PurpurWorldConfig {
public double squidMaxHealth = 10.0D;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;
@@ -81,7 +81,7 @@ index d32b008263ec45310320ae71457505432e1fbc85..33e2317646ca7b77537c8d52235f5a19
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -1381,6 +1384,7 @@ public class PurpurWorldConfig {
@@ -1386,6 +1389,7 @@ public class PurpurWorldConfig {
squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);

4
patches/server/0114-Stonecutter-damage.patch
View File

@@ -61,10 +61,10 @@ index 2ad5ff9a1d7de54e75436e99da8a73db9dc91bde..60605a8a021cc56f9c3ba22bc43c43c3
} else if (blockState.is(Blocks.HONEY_BLOCK)) {
return BlockPathTypes.STICKY_HONEY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9a4e52097e767ac00a5a9dde3137efc28858300e..90ace8ccf344a0f7b496e7d9cb5d49d6789d166b 100644
index c7bac948061bacbd50560bddc5a4a4108853f28f..05556f2d9f414a8718a616afcb1d15b2b97e2717 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -449,6 +449,11 @@ public class PurpurWorldConfig {
@@ -454,6 +454,11 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

4
patches/server/0117-Furnace-uses-lava-from-underneath.patch
View File

@@ -48,10 +48,10 @@ index 242d9b2ecb852d812d4887883cb2aabfd21e3715..2c64622577fdb6c2a5746471121403b6
private static boolean canBurn(@Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f21a02e3763d42ebe8130802269a99be54b24163..ac1969941cb582d3744b0a516417639b19269c20 100644
index fd8430ad5419655f9d53f532e0f5c3d8391425f2..ec8ee7c39f40c24b4a2ee4e052c48fdf43bff645 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -417,6 +417,17 @@ public class PurpurWorldConfig {
@@ -422,6 +422,17 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0119-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
View File

@@ -24,10 +24,10 @@ index ee5bc54e37e5ae120e846ddd2cae5ca39c293c98..f2ddc1c9c4fa029544866b779b4b0359
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ac1969941cb582d3744b0a516417639b19269c20..78e6063501b86131df3c23a703283c315d41cd49 100644
index ec8ee7c39f40c24b4a2ee4e052c48fdf43bff645..74544421716246a73876f4a39711ee25438a8f2c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -413,8 +413,10 @@ public class PurpurWorldConfig {
@@ -418,8 +418,10 @@ public class PurpurWorldConfig {
}
public boolean farmlandGetsMoistFromBelow = false;

6
patches/server/0120-Add-adjustable-breeding-cooldown-to-config.patch
View File

@@ -95,10 +95,10 @@ index 514e4ff64275a45ddd9aa4e0c8245aaa5483306c..27674fb28825b48eee86b93d6bbd1e7a
this.world = new CraftWorld((ServerLevel) this, gen, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 78e6063501b86131df3c23a703283c315d41cd49..8f6db28958e0766460d1413b4ec0b2bd41cfb687 100644
index 74544421716246a73876f4a39711ee25438a8f2c..db50fe00f2e725d0ab44f8704443cf6107e39d4e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -349,6 +349,7 @@ public class PurpurWorldConfig {
@@ -354,6 +354,7 @@ public class PurpurWorldConfig {
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
public int raidCooldownSeconds = 0;
@@ -106,7 +106,7 @@ index 78e6063501b86131df3c23a703283c315d41cd49..8f6db28958e0766460d1413b4ec0b2bd
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -360,6 +361,7 @@ public class PurpurWorldConfig {
@@ -365,6 +366,7 @@ public class PurpurWorldConfig {
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);

90
patches/server/0121-Make-entity-breeding-times-configurable.patch
View File

@@ -474,10 +474,10 @@ index fb0aa2854f8be22682ee65298080b668c722f447..975e15a501f01c1f87b80ee20d57f4d2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d36beea5c 100644
index db50fe00f2e725d0ab44f8704443cf6107e39d4e..42f1ef15f020b2b62079d23fde09b788d204dc17 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -487,9 +487,11 @@ public class PurpurWorldConfig {
@@ -492,9 +492,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean batRidable = false;
@@ -519,6 +521,7 @@ public class PurpurWorldConfig {
@@ -524,6 +526,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -529,6 +532,7 @@ public class PurpurWorldConfig {
@@ -534,6 +537,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean blazeRidable = false;
@@ -553,6 +557,7 @@ public class PurpurWorldConfig {
@@ -558,6 +562,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -565,6 +570,7 @@ public class PurpurWorldConfig {
@@ -570,6 +575,7 @@ public class PurpurWorldConfig {
catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -521,7 +521,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean caveSpiderRidable = false;
@@ -585,6 +591,7 @@ public class PurpurWorldConfig {
@@ -590,6 +596,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -595,6 +602,7 @@ public class PurpurWorldConfig {
@@ -600,6 +607,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean codRidable = false;
@@ -613,6 +621,7 @@ public class PurpurWorldConfig {
@@ -618,6 +626,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -623,6 +632,7 @@ public class PurpurWorldConfig {
@@ -628,6 +637,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -553,7 +553,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean creeperRidable = false;
@@ -670,6 +680,7 @@ public class PurpurWorldConfig {
@@ -675,6 +685,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -685,6 +696,7 @@ public class PurpurWorldConfig {
@@ -690,6 +701,7 @@ public class PurpurWorldConfig {
donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -569,7 +569,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean drownedRidable = false;
@@ -791,6 +803,7 @@ public class PurpurWorldConfig {
@@ -796,6 +808,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -801,6 +814,7 @@ public class PurpurWorldConfig {
@@ -806,6 +819,7 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -585,7 +585,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean ghastRidable = false;
@@ -861,10 +875,12 @@ public class PurpurWorldConfig {
@@ -866,10 +880,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean guardianRidable = false;
@@ -882,6 +898,7 @@ public class PurpurWorldConfig {
@@ -887,6 +903,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -891,6 +908,7 @@ public class PurpurWorldConfig {
@@ -896,6 +913,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean horseRidableInWater = false;
@@ -900,6 +918,7 @@ public class PurpurWorldConfig {
@@ -905,6 +923,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -915,6 +934,7 @@ public class PurpurWorldConfig {
@@ -920,6 +939,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -630,7 +630,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean huskRidable = false;
@@ -985,6 +1005,7 @@ public class PurpurWorldConfig {
@@ -990,6 +1010,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1001,6 +1022,7 @@ public class PurpurWorldConfig {
@@ -1006,6 +1027,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -646,7 +646,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean magmaCubeRidable = false;
@@ -1020,6 +1042,7 @@ public class PurpurWorldConfig {
@@ -1025,6 +1047,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1029,6 +1052,7 @@ public class PurpurWorldConfig {
@@ -1034,6 +1057,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean muleRidableInWater = false;
@@ -1038,6 +1062,7 @@ public class PurpurWorldConfig {
@@ -1043,6 +1067,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1053,11 +1078,13 @@ public class PurpurWorldConfig {
@@ -1058,11 +1083,13 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -684,7 +684,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1067,11 +1094,13 @@ public class PurpurWorldConfig {
@@ -1072,11 +1099,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1081,6 +1110,7 @@ public class PurpurWorldConfig {
@@ -1086,6 +1115,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean parrotRidable = false;
@@ -1161,6 +1191,7 @@ public class PurpurWorldConfig {
@@ -1166,6 +1196,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1171,6 +1202,7 @@ public class PurpurWorldConfig {
@@ -1176,6 +1207,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -722,7 +722,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean piglinRidable = false;
@@ -1220,6 +1252,7 @@ public class PurpurWorldConfig {
@@ -1225,6 +1257,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1232,6 +1265,7 @@ public class PurpurWorldConfig {
@@ -1237,6 +1270,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -738,7 +738,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean pufferfishRidable = false;
@@ -1251,6 +1285,7 @@ public class PurpurWorldConfig {
@@ -1256,6 +1290,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1262,6 +1297,7 @@ public class PurpurWorldConfig {
@@ -1267,6 +1302,7 @@ public class PurpurWorldConfig {
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -754,7 +754,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean ravagerRidable = false;
@@ -1293,6 +1329,7 @@ public class PurpurWorldConfig {
@@ -1298,6 +1334,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1302,6 +1339,7 @@ public class PurpurWorldConfig {
@@ -1307,6 +1344,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean shulkerRidable = false;
@@ -1456,6 +1494,7 @@ public class PurpurWorldConfig {
@@ -1461,6 +1499,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1465,6 +1504,7 @@ public class PurpurWorldConfig {
@@ -1470,6 +1509,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean traderLlamaRidable = false;
@@ -1475,6 +1515,7 @@ public class PurpurWorldConfig {
@@ -1480,6 +1520,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1491,6 +1532,7 @@ public class PurpurWorldConfig {
@@ -1496,6 +1537,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -802,7 +802,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean tropicalFishRidable = false;
@@ -1511,6 +1553,7 @@ public class PurpurWorldConfig {
@@ -1516,6 +1558,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1523,6 +1566,7 @@ public class PurpurWorldConfig {
@@ -1528,6 +1571,7 @@ public class PurpurWorldConfig {
turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
@@ -818,7 +818,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean vexRidable = false;
@@ -1551,6 +1595,7 @@ public class PurpurWorldConfig {
@@ -1556,6 +1600,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1567,6 +1612,7 @@ public class PurpurWorldConfig {
@@ -1572,6 +1617,7 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -834,7 +834,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
}
public boolean vindicatorRidable = false;
@@ -1658,6 +1704,7 @@ public class PurpurWorldConfig {
@@ -1663,6 +1709,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index 8f6db28958e0766460d1413b4ec0b2bd41cfb687..21b93da96d17ef6c87c18d5d9bb3b99d
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1667,6 +1714,7 @@ public class PurpurWorldConfig {
@@ -1672,6 +1719,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0122-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -142,7 +142,7 @@ index e5b042f2445eb06fb8075ba539c836595814fa14..8cdede6a9698d6c99b4f08edc2a3403f
if (((HangingEntity) object).survives()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 21b93da96d17ef6c87c18d5d9bb3b99d36beea5c..525c05f3d64c76b2a0d470ba38125b49232a8dbd 100644
index 42f1ef15f020b2b62079d23fde09b788d204dc17..e79720605098b1773227f02705c29415a4723ccc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -100,8 +100,10 @@ public class PurpurWorldConfig {
@@ -156,7 +156,7 @@ index 21b93da96d17ef6c87c18d5d9bb3b99d36beea5c..525c05f3d64c76b2a0d470ba38125b49
}
public int daytimeTicks = 12000;
@@ -345,6 +347,7 @@ public class PurpurWorldConfig {
@@ -350,6 +352,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
@@ -164,7 +164,7 @@ index 21b93da96d17ef6c87c18d5d9bb3b99d36beea5c..525c05f3d64c76b2a0d470ba38125b49
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -357,6 +360,7 @@ public class PurpurWorldConfig {
@@ -362,6 +365,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);

6
patches/server/0124-Add-twisting-and-weeping-vines-growth-rates.patch
View File

@@ -82,10 +82,10 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 923baa127fd13fae044d67c674ce2882ddda191b..6dfc72686df9db4ea244ca2eec2e84a976990b99 100644
index 45363eb67ab0c30c687a556392afe8e44e3d5f0d..7d5493fea2b7cfb26221e8592c7c3ef9cb65d05d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -413,6 +413,11 @@ public class PurpurWorldConfig {
@@ -418,6 +418,11 @@ public class PurpurWorldConfig {
}
}
@@ -97,7 +97,7 @@ index 923baa127fd13fae044d67c674ce2882ddda191b..6dfc72686df9db4ea244ca2eec2e84a9
public boolean dispenserApplyCursedArmor = true;
public boolean dispenserPlaceAnvils = false;
private void dispenserSettings() {
@@ -482,6 +487,16 @@ public class PurpurWorldConfig {
@@ -487,6 +492,16 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}

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

@@ -103,10 +103,10 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca
// Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6dfc72686df9db4ea244ca2eec2e84a976990b99..2ab931e6324c059d9be270f7500d3f2eed3b25f1 100644
index 7d5493fea2b7cfb26221e8592c7c3ef9cb65d05d..7afbb2fb08fa651a11da52582f2b50188e24d086 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -414,8 +414,10 @@ public class PurpurWorldConfig {
@@ -419,8 +419,10 @@ public class PurpurWorldConfig {
}
public double caveVinesGrowthModifier = 0.10D;
@@ -117,7 +117,7 @@ index 6dfc72686df9db4ea244ca2eec2e84a976990b99..2ab931e6324c059d9be270f7500d3f2e
}
public boolean dispenserApplyCursedArmor = true;
@@ -454,6 +456,11 @@ public class PurpurWorldConfig {
@@ -459,6 +461,11 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}
@@ -129,7 +129,7 @@ index 6dfc72686df9db4ea244ca2eec2e84a976990b99..2ab931e6324c059d9be270f7500d3f2e
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -488,13 +495,17 @@ public class PurpurWorldConfig {
@@ -493,13 +500,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

6
patches/server/0126-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
View File

@@ -21,10 +21,10 @@ index 10c3a0c49579fbd9f1fe7ec82eebd42be3412b69..f701807f2593189632a2a556e82bc0f1
private static class EndermanFreezeWhenLookedAt extends Goal {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2ab931e6324c059d9be270f7500d3f2eed3b25f1..b81cc2565fd07d218dc67c2db3782339d0b88765 100644
index 7afbb2fb08fa651a11da52582f2b50188e24d086..85d3c66d000f4402c05e41873a3e0ed519f67249 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -791,6 +791,7 @@ public class PurpurWorldConfig {
@@ -796,6 +796,7 @@ public class PurpurWorldConfig {
public boolean endermanRidableInWater = false;
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index 2ab931e6324c059d9be270f7500d3f2eed3b25f1..b81cc2565fd07d218dc67c2db3782339
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -801,6 +802,7 @@ public class PurpurWorldConfig {
@@ -806,6 +807,7 @@ public class PurpurWorldConfig {
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);

4
patches/server/0128-Add-configurable-snowball-damage.patch
View File

@@ -18,10 +18,10 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b81cc2565fd07d218dc67c2db3782339d0b88765..743e1b5448149be6d2a5adf41e6ded351883418c 100644
index 85d3c66d000f4402c05e41873a3e0ed519f67249..14f7fb59c2b5840254afe7695e1b7413ec5909e8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -289,6 +289,11 @@ public class PurpurWorldConfig {
@@ -294,6 +294,11 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
}

6
patches/server/0129-Zombie-break-door-minimum-difficulty-option.patch
View File

@@ -44,10 +44,10 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 743e1b5448149be6d2a5adf41e6ded351883418c..e567f3d21b047654750aadc7cfa84e9972905215 100644
index 14f7fb59c2b5840254afe7695e1b7413ec5909e8..a589e2292aae4402cef2a6a6cea68ab1f81d7f5a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1778,6 +1778,7 @@ public class PurpurWorldConfig {
@@ -1783,6 +1783,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -55,7 +55,7 @@ index 743e1b5448149be6d2a5adf41e6ded351883418c..e567f3d21b047654750aadc7cfa84e99
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1792,6 +1793,11 @@ public class PurpurWorldConfig {
@@ -1797,6 +1798,11 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);

6
patches/server/0132-Add-boat-fall-damage-config.patch
View File

@@ -27,10 +27,10 @@ index 32b56e8b042e32daa44638688ea663556627b382..8c93a84f9b44316fedc1544a309d27ef
if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 76eb2d3dfd5455448140ef69bdb9698fbc82e105..48750ecf92acf344390c550597af87a2d9b888e7 100644
index 6060068efe2ad4e3a2c6113a92e1e02db2da5d18..3c47f92a02361b4ed671c3f2a04a85f965a18d93 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -352,6 +352,7 @@ public class PurpurWorldConfig {
@@ -357,6 +357,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
@@ -38,7 +38,7 @@ index 76eb2d3dfd5455448140ef69bdb9698fbc82e105..48750ecf92acf344390c550597af87a2
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -365,6 +366,7 @@ public class PurpurWorldConfig {
@@ -370,6 +371,7 @@ public class PurpurWorldConfig {
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);

6
patches/server/0133-Snow-Golem-rate-of-fire-config.patch
View File

@@ -23,10 +23,10 @@ index ee64f4084b25d77f1c25b76a5b7d90cd2547bffb..5e370d5137564ddcfb76a81b92d43e25
this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 48750ecf92acf344390c550597af87a2d9b888e7..b7d6a9d783d306a88e162bf13fa7d9d8f8a21fd0 100644
index 3c47f92a02361b4ed671c3f2a04a85f965a18d93..92a401270ef46e7e8f0b458cfac7ce67ed565cb1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1474,6 +1474,10 @@ public class PurpurWorldConfig {
@@ -1479,6 +1479,10 @@ public class PurpurWorldConfig {
public double snowGolemMaxHealth = 4.0D;
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
@@ -37,7 +37,7 @@ index 48750ecf92acf344390c550597af87a2d9b888e7..b7d6a9d783d306a88e162bf13fa7d9d8
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1486,6 +1490,10 @@ public class PurpurWorldConfig {
@@ -1491,6 +1495,10 @@ public class PurpurWorldConfig {
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);

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

@@ -56,10 +56,10 @@ index 1d03e936b696f3b7e88b411816a8195a716fc3eb..80d86ce8944e38dcdbd15574aea4e3cb
if (this.assignProfessionWhenSpawned) {
this.assignProfessionWhenSpawned = false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b7d6a9d783d306a88e162bf13fa7d9d8f8a21fd0..076e0ebdcb5334a4d89d53e31aa751ccf7df2ea2 100644
index 92a401270ef46e7e8f0b458cfac7ce67ed565cb1..e9965b16c346344e7e0fae2a113b53268f04a92f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1647,6 +1647,8 @@ public class PurpurWorldConfig {
@@ -1652,6 +1652,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
public int villagerBreedingTicks = 6000;
@@ -68,7 +68,7 @@ index b7d6a9d783d306a88e162bf13fa7d9d8f8a21fd0..076e0ebdcb5334a4d89d53e31aa751cc
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1664,6 +1666,13 @@ public class PurpurWorldConfig {
@@ -1669,6 +1671,13 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);

6
patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -185,10 +185,10 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612
public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 076e0ebdcb5334a4d89d53e31aa751ccf7df2ea2..2f930b0ee8d463f2e39d1f1c8483e13fd5183a6c 100644
index e9965b16c346344e7e0fae2a113b53268f04a92f..11959f09d204cd08a04f7dc7d2aecd18e2430bb3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1649,6 +1649,8 @@ public class PurpurWorldConfig {
@@ -1654,6 +1654,8 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheck = 60;
@@ -197,7 +197,7 @@ index 076e0ebdcb5334a4d89d53e31aa751ccf7df2ea2..2f930b0ee8d463f2e39d1f1c8483e13f
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1673,6 +1675,8 @@ public class PurpurWorldConfig {
@@ -1678,6 +1680,8 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);

6
patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
View File

@@ -35,10 +35,10 @@ index 5b5958e37918b97fa994500fe94cd0e57faa1948..64216c9d76ce5ec6a845915ca078b0c0
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2f930b0ee8d463f2e39d1f1c8483e13fd5183a6c..63fb94c323f1f0d63f46a42ccdb2ebe44ab77cc1 100644
index 11959f09d204cd08a04f7dc7d2aecd18e2430bb3..3538ee8f9526e28a38aca1b69e49b0ada5b57603 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1881,6 +1881,7 @@ public class PurpurWorldConfig {
@@ -1886,6 +1886,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 2f930b0ee8d463f2e39d1f1c8483e13fd5183a6c..63fb94c323f1f0d63f46a42ccdb2ebe4
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1894,5 +1895,6 @@ public class PurpurWorldConfig {
@@ -1899,5 +1900,6 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby);
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);

6
patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -201,10 +201,10 @@ index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8
return super.mobInteract(player, hand);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 63fb94c323f1f0d63f46a42ccdb2ebe44ab77cc1..46338c0dcbe2edc03bb755950475bee95ff6602a 100644
index 3538ee8f9526e28a38aca1b69e49b0ada5b57603..9d17110efe1d606fcc446654d55d09716fd53e2c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1768,6 +1768,8 @@ public class PurpurWorldConfig {
@@ -1773,6 +1773,8 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index 63fb94c323f1f0d63f46a42ccdb2ebe44ab77cc1..46338c0dcbe2edc03bb755950475bee9
public int wolfBreedingTicks = 6000;
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
@@ -1778,6 +1780,8 @@ public class PurpurWorldConfig {
@@ -1783,6 +1785,8 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0140-Configurable-default-wolf-collar-color.patch
View File

@@ -24,10 +24,10 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 46338c0dcbe2edc03bb755950475bee95ff6602a..d43e3d9ffdf24e00eeec589ab95edaa75d860338 100644
index 9d17110efe1d606fcc446654d55d09716fd53e2c..125aceb43ce18c1dd0dae41c444394c3953773e1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1768,6 +1768,7 @@ public class PurpurWorldConfig {
@@ -1773,6 +1773,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -35,7 +35,7 @@ index 46338c0dcbe2edc03bb755950475bee95ff6602a..d43e3d9ffdf24e00eeec589ab95edaa7
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -1780,6 +1781,11 @@ public class PurpurWorldConfig {
@@ -1785,6 +1786,11 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);

6
patches/server/0141-Phantom-flames-on-swoop.patch
View File

@@ -17,10 +17,10 @@ index c55aba456aa144e58fc35877c61eff309eaa391f..c39e2d05fa81279a684532ee796880b1
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d43e3d9ffdf24e00eeec589ab95edaa75d860338..fde7aa8d1da2a5d9517c8ac23e3624506b3c5ee8 100644
index 125aceb43ce18c1dd0dae41c444394c3953773e1..112cbf62bf97a25d44933e80d637b4169889db20 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1178,6 +1178,7 @@ public class PurpurWorldConfig {
@@ -1183,6 +1183,7 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -28,7 +28,7 @@ index d43e3d9ffdf24e00eeec589ab95edaa75d860338..fde7aa8d1da2a5d9517c8ac23e362450
public double phantomMaxHealth = 20.0D;
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
@@ -1204,6 +1205,7 @@ public class PurpurWorldConfig {
@@ -1209,6 +1210,7 @@ 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);

4
patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@@ -17,10 +17,10 @@ index eecb8c089b5f426b1395b47f714af32c210555ef..ac82e2b0f4ca1232cc7ec6e4c7dd2613
return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fde7aa8d1da2a5d9517c8ac23e3624506b3c5ee8..03d2d735b3e8839b467d93696d1a6f4481f57a41 100644
index 112cbf62bf97a25d44933e80d637b4169889db20..317daf176c8ee961c5feaa738b406b8f5a42e1aa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -429,6 +429,11 @@ public class PurpurWorldConfig {
@@ -434,6 +434,11 @@ public class PurpurWorldConfig {
caveVinesMaxGrowthAge = getInt("blocks.cave_vines.max-growth-age", caveVinesMaxGrowthAge);
}

6
patches/server/0144-Striders-give-saddle-back.patch
View File

@@ -28,10 +28,10 @@ index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 03d2d735b3e8839b467d93696d1a6f4481f57a41..083a450dcd285434c5c6d1ffb52f29d590d3609a 100644
index 317daf176c8ee961c5feaa738b406b8f5a42e1aa..cb5a4a7510245ade742b780c9ffd68e7596abfc9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1553,6 +1553,7 @@ public class PurpurWorldConfig {
@@ -1558,6 +1558,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
@@ -39,7 +39,7 @@ index 03d2d735b3e8839b467d93696d1a6f4481f57a41..083a450dcd285434c5c6d1ffb52f29d5
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1563,6 +1564,7 @@ public class PurpurWorldConfig {
@@ -1568,6 +1569,7 @@ public class PurpurWorldConfig {
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);

70
patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,10 +393,10 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
return true;
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34fc3b6b2d 100644
index 04d4a00cd21c9640e3edc1dde0c3b9927d0bdd78..7d6ebaf7e0faa072b5343424ab9f652a6bf404b2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -368,9 +368,12 @@ public class PurpurWorldConfig {
@@ -373,9 +373,12 @@ public class PurpurWorldConfig {
public boolean boatsDoFallDamage = true;
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
@@ -409,7 +409,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -382,9 +385,12 @@ public class PurpurWorldConfig {
@@ -387,9 +390,12 @@ public class PurpurWorldConfig {
boatsDoFallDamage = getBoolean("gameplay-mechanics.boat.do-fall-damage", boatsDoFallDamage);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
@@ -422,7 +422,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
@@ -454,9 +460,11 @@ public class PurpurWorldConfig {
@@ -459,9 +465,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -434,7 +434,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -488,6 +496,11 @@ public class PurpurWorldConfig {
@@ -493,6 +501,11 @@ public class PurpurWorldConfig {
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
}
@@ -446,7 +446,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -521,6 +534,11 @@ public class PurpurWorldConfig {
@@ -526,6 +539,11 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -458,7 +458,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
public double twistingVinesGrowthModifier = 0.10D;
public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() {
@@ -699,6 +717,7 @@ public class PurpurWorldConfig {
@@ -704,6 +722,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -710,6 +729,7 @@ public class PurpurWorldConfig {
@@ -715,6 +734,7 @@ public class PurpurWorldConfig {
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -474,7 +474,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean dolphinRidable = false;
@@ -797,6 +817,7 @@ public class PurpurWorldConfig {
@@ -802,6 +822,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -812,6 +833,7 @@ public class PurpurWorldConfig {
@@ -817,6 +838,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -490,7 +490,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean endermanRidable = false;
@@ -819,6 +841,7 @@ public class PurpurWorldConfig {
@@ -824,6 +846,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -830,6 +853,7 @@ public class PurpurWorldConfig {
@@ -835,6 +858,7 @@ public class PurpurWorldConfig {
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -506,7 +506,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean endermiteRidable = false;
@@ -849,6 +873,7 @@ public class PurpurWorldConfig {
@@ -854,6 +878,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -858,6 +883,7 @@ public class PurpurWorldConfig {
@@ -863,6 +888,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean foxRidable = false;
@@ -865,6 +891,7 @@ public class PurpurWorldConfig {
@@ -870,6 +896,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -876,6 +903,7 @@ public class PurpurWorldConfig {
@@ -881,6 +908,7 @@ public class PurpurWorldConfig {
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -538,7 +538,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean ghastRidable = false;
@@ -1271,6 +1299,7 @@ public class PurpurWorldConfig {
@@ -1276,6 +1304,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1280,6 +1309,7 @@ public class PurpurWorldConfig {
@@ -1285,6 +1314,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean piglinBruteRidable = false;
@@ -1299,6 +1329,7 @@ public class PurpurWorldConfig {
@@ -1304,6 +1334,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1308,6 +1339,7 @@ public class PurpurWorldConfig {
@@ -1313,6 +1344,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean polarBearRidable = false;
@@ -1349,6 +1381,7 @@ public class PurpurWorldConfig {
@@ -1354,6 +1386,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1361,11 +1394,13 @@ public class PurpurWorldConfig {
@@ -1366,11 +1399,13 @@ public class PurpurWorldConfig {
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -592,7 +592,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1375,6 +1410,7 @@ public class PurpurWorldConfig {
@@ -1380,6 +1415,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean salmonRidable = false;
@@ -1393,6 +1429,7 @@ public class PurpurWorldConfig {
@@ -1398,6 +1434,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1403,6 +1440,7 @@ public class PurpurWorldConfig {
@@ -1408,6 +1445,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean shulkerRidable = false;
@@ -1422,6 +1460,7 @@ public class PurpurWorldConfig {
@@ -1427,6 +1465,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1431,6 +1470,7 @@ public class PurpurWorldConfig {
@@ -1436,6 +1475,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean skeletonRidable = false;
@@ -1498,6 +1538,7 @@ public class PurpurWorldConfig {
@@ -1503,6 +1543,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1514,6 +1555,7 @@ public class PurpurWorldConfig {
@@ -1519,6 +1560,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -648,7 +648,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean squidRidable = false;
@@ -1673,6 +1715,7 @@ public class PurpurWorldConfig {
@@ -1678,6 +1720,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1699,6 +1742,7 @@ public class PurpurWorldConfig {
@@ -1704,6 +1747,7 @@ public class PurpurWorldConfig {
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean vindicatorRidable = false;
@@ -1755,6 +1799,7 @@ public class PurpurWorldConfig {
@@ -1760,6 +1804,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1771,6 +1816,7 @@ public class PurpurWorldConfig {
@@ -1776,6 +1821,7 @@ public class PurpurWorldConfig {
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -680,7 +680,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
}
public boolean witherSkeletonRidable = false;
@@ -1836,6 +1882,7 @@ public class PurpurWorldConfig {
@@ -1841,6 +1887,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 126825703e1c5b835b2b1e9b950a7b6c56dacd0c..3b72d437226bbcd83340c2d9f24ddd34
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1855,6 +1902,7 @@ public class PurpurWorldConfig {
@@ -1860,6 +1907,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}

6
patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch
View File

@@ -22,10 +22,10 @@ index d3c8fd8399629efb8bcbaf7d9a0c43340fcdfeda..c74df3b5c2a25469ad3fb6a853438bbc
org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3b72d437226bbcd83340c2d9f24ddd34fc3b6b2d..803bb54f4eccdf5d0cc98f3bd77bdd1be9d4a165 100644
index 7d6ebaf7e0faa072b5343424ab9f652a6bf404b2..efdfaf989a1f51759f240d95ef425694b35f5e06 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -371,6 +371,7 @@ public class PurpurWorldConfig {
@@ -376,6 +376,7 @@ public class PurpurWorldConfig {
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
public boolean milkCuresBadOmen = true;
@@ -33,7 +33,7 @@ index 3b72d437226bbcd83340c2d9f24ddd34fc3b6b2d..803bb54f4eccdf5d0cc98f3bd77bdd1b
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
public boolean projectilesBypassMobGriefing = false;
@@ -388,6 +389,7 @@ public class PurpurWorldConfig {
@@ -393,6 +394,7 @@ public class PurpurWorldConfig {
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

8
patches/server/0151-Add-EntityTeleportHinderedEvent.patch
View File

@@ -78,10 +78,10 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 803bb54f4eccdf5d0cc98f3bd77bdd1be9d4a165..7da3428b2923a2ecfeb5a5ba8915936430d04740 100644
index efdfaf989a1f51759f240d95ef425694b35f5e06..19b162cd4d8fa4f5c996d54800e3859c88a5d900 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -370,6 +370,7 @@ public class PurpurWorldConfig {
@@ -375,6 +375,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean fireballsBypassMobGriefing = false;
@@ -89,7 +89,7 @@ index 803bb54f4eccdf5d0cc98f3bd77bdd1be9d4a165..7da3428b2923a2ecfeb5a5ba89159364
public boolean milkCuresBadOmen = true;
public boolean noteBlockIgnoreAbove = false;
public boolean persistentTileEntityDisplayNames = false;
@@ -388,6 +389,7 @@ public class PurpurWorldConfig {
@@ -393,6 +394,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
@@ -113,7 +113,7 @@ index fb5cd6fe7903f3f96af1abb55832bafb7ca7f4a8..4175462de0d6306e4cd0871853ef4f0a
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 15f7092468fd341d4e5d22163ea0e265803e5139..7474ead18b667290c6bbe1d692b09d58bccf6b39 100644
index 12e1ac91244b615c4d26fe3f9d74dcc9d4309e11..e409c6c4f4da1cb2d4a42971dbc362a258a51d3b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1008,6 +1008,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
patches/server/0153-Farmland-trampling-changes.patch
View File

@@ -37,10 +37,10 @@ index 2a33fbdc1d047584b0cd4b3da5892ccd7efc6943..6bfaeaeb6f9accf269febbf3e0d71d57
if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
return;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7da3428b2923a2ecfeb5a5ba8915936430d04740..c4795689fdf5bdccd6f2b16f93801be769fa8565 100644
index 19b162cd4d8fa4f5c996d54800e3859c88a5d900..08f96bb13b0bc201a298a91c04d9fa22f0aba77f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -467,10 +467,16 @@ public class PurpurWorldConfig {
@@ -472,10 +472,16 @@ public class PurpurWorldConfig {
public boolean farmlandBypassMobGriefing = false;
public boolean farmlandGetsMoistFromBelow = false;
public boolean farmlandAlpha = false;

8
patches/server/0155-Fix-stuck-in-portals.patch
View File

@@ -37,7 +37,7 @@ index 4214dc49e2758be99ca204cb33f2dcc7b0109b65..a1cbeb306d5bcf619a3a338822209f6f
this.isInsidePortal = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 50f271ff9949241caec638d96caa782f945b7d52..b578c89ed02b093e329ba93775a3552e5a568883 100644
index 3135325fa86dd88f28c72b1a132939c921149eb7..b6c4f29c80ca88c977f21da69e528777f4ed7e04 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -296,6 +296,7 @@ public class PurpurWorldConfig {
@@ -46,9 +46,9 @@ index 50f271ff9949241caec638d96caa782f945b7d52..b578c89ed02b093e329ba93775a3552e
public boolean totemOfUndyingWorksInInventory = false;
+ public boolean playerFixStuckPortal = false;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -308,6 +309,7 @@ public class PurpurWorldConfig {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -313,6 +314,7 @@ public class PurpurWorldConfig {
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);

18
patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -70,10 +70,10 @@ index 66dab9b4e5ae05deeae11c8588a0b855d8847bdc..19753a1855b11f8cdc9fb77e8d9079bb
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c3933b09b8af 100644
index b6c4f29c80ca88c977f21da69e528777f4ed7e04..86072c35bc0050fc9e85ff032142cc75d8a716d6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -634,6 +634,7 @@ public class PurpurWorldConfig {
@@ -639,6 +639,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -644,6 +645,7 @@ public class PurpurWorldConfig {
@@ -649,6 +650,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -89,7 +89,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
}
public boolean catRidable = false;
@@ -860,6 +862,7 @@ public class PurpurWorldConfig {
@@ -865,6 +867,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -872,6 +875,7 @@ public class PurpurWorldConfig {
@@ -877,6 +880,7 @@ public class PurpurWorldConfig {
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
@@ -105,7 +105,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
}
public boolean endermiteRidable = false;
@@ -1557,6 +1561,7 @@ public class PurpurWorldConfig {
@@ -1562,6 +1566,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1574,6 +1579,7 @@ public class PurpurWorldConfig {
@@ -1579,6 +1584,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);
@@ -121,7 +121,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
}
public boolean squidRidable = false;
@@ -1627,6 +1633,7 @@ public class PurpurWorldConfig {
@@ -1632,6 +1638,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1638,6 +1645,7 @@ public class PurpurWorldConfig {
@@ -1643,6 +1650,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);

6
patches/server/0157-Config-to-always-tame-in-Creative.patch
View File

@@ -59,10 +59,10 @@ index 518dd0e6b4889c049e438b393baa795a5eac3e7d..21e154c4e7fe261a41c891b481072fbd
this.navigation.stop();
this.setTarget((LivingEntity) null);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8e3d7bb364f9581dd27145672c87c3933b09b8af..b87830f9454388eb71efcd9382912e031446c0fc 100644
index 86072c35bc0050fc9e85ff032142cc75d8a716d6..6cbb7aa50d0b179e9e0bca182295682a3f3a3732 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -372,6 +372,7 @@ public class PurpurWorldConfig {
@@ -377,6 +377,7 @@ public class PurpurWorldConfig {
}
public boolean useBetterMending = false;
@@ -70,7 +70,7 @@ index 8e3d7bb364f9581dd27145672c87c3933b09b8af..b87830f9454388eb71efcd9382912e03
public boolean boatEjectPlayersOnLand = false;
public boolean boatsDoFallDamage = true;
public boolean disableDropsOnCrammingDeath = false;
@@ -391,6 +392,7 @@ public class PurpurWorldConfig {
@@ -396,6 +397,7 @@ public class PurpurWorldConfig {
public int animalBreedingCooldownSeconds = 0;
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);

4
patches/server/0158-End-crystal-explosion-options.patch
View File

@@ -52,10 +52,10 @@ index 92e65f3fbc8f5d77bb8cc31e7a7780c2589f4227..0c46507ab0b904fb1f79bc5421c88c03
this.onDestroyedBy(source);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b87830f9454388eb71efcd9382912e031446c0fc..6608389d1715b7ce22689128b726195b503cc82c 100644
index 6cbb7aa50d0b179e9e0bca182295682a3f3a3732..155cb77b8aba0aa0a76ca1219f8daeaf83ce4a04 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -474,6 +474,35 @@ public class PurpurWorldConfig {
@@ -479,6 +479,35 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}

10
patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
View File

@@ -29,10 +29,10 @@ index bdcbe92cbe431727f5879a04bf734811ffd03c3d..257a1b91c65d9f66173cfe8a31f598a0
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6608389d1715b7ce22689128b726195b503cc82c..ee84e6aef5c0e747c71c2b345eebfb99da406b8d 100644
index 155cb77b8aba0aa0a76ca1219f8daeaf83ce4a04..bc81ceaef6ac2da472c49a74870d5bfd74ad0c3f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -869,6 +869,7 @@ public class PurpurWorldConfig {
@@ -874,6 +874,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
public boolean enderDragonBypassMobGriefing = false;
@@ -40,7 +40,7 @@ index 6608389d1715b7ce22689128b726195b503cc82c..ee84e6aef5c0e747c71c2b345eebfb99
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -885,6 +886,7 @@ public class PurpurWorldConfig {
@@ -890,6 +891,7 @@ public class PurpurWorldConfig {
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
@@ -48,7 +48,7 @@ index 6608389d1715b7ce22689128b726195b503cc82c..ee84e6aef5c0e747c71c2b345eebfb99
}
public boolean endermanRidable = false;
@@ -1857,6 +1859,7 @@ public class PurpurWorldConfig {
@@ -1862,6 +1864,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -56,7 +56,7 @@ index 6608389d1715b7ce22689128b726195b503cc82c..ee84e6aef5c0e747c71c2b345eebfb99
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1874,6 +1877,7 @@ public class PurpurWorldConfig {
@@ -1879,6 +1882,7 @@ 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);

8
patches/server/0162-One-Punch-Man.patch
View File

@@ -30,7 +30,7 @@ index 4f8f29264971f53ca273c5b21732864dedcb5463..68f247f9e3a6dbb3b92b5a077de170c4
if (human) {
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7ea2cf4712963cbb2a750ade4d5609ee49be9732..6475a8289a774c0407d4de2167c9e98103263d38 100644
index d51e861fe8ffab512ef42c2bde7f316b6a231101..1c1d169aaf5158029778f3635d72878f32f4786a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -301,6 +301,7 @@ public class PurpurWorldConfig {
@@ -39,9 +39,9 @@ index 7ea2cf4712963cbb2a750ade4d5609ee49be9732..6475a8289a774c0407d4de2167c9e981
public boolean playerFixStuckPortal = false;
+ public boolean creativeOnePunch = false;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -314,6 +315,7 @@ public class PurpurWorldConfig {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -319,6 +320,7 @@ public class PurpurWorldConfig {
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);

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

@@ -29,10 +29,10 @@ index 0169d874247a96c2e10a65ecb9c0c093f5a6ecfb..b760e2d014b3ae70671878082bb853b7
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6475a8289a774c0407d4de2167c9e98103263d38..2b2668e3245a9bf13942de18fdfc3ea38a41a873 100644
index 1c1d169aaf5158029778f3635d72878f32f4786a..9956f0d219b8570eadff207aeffedee079250135 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -535,6 +535,11 @@ public class PurpurWorldConfig {
@@ -540,6 +540,11 @@ public class PurpurWorldConfig {
furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
}

8
patches/server/0165-Config-to-ignore-nearby-mobs-when-sleeping.patch
View File

@@ -18,7 +18,7 @@ index e081a02d6799d8d74db06ca84e224c395e95a308..26fcead85fe017a27d41697cbf7b6d1d
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 44ffdbe9fa16ab111e2f598a47ba54194d4d94dd..39496742ed05737029e67592755cd74331e1cb95 100644
index 80e1d3c7ea6f5228924d8c2dc033262fd46c4691..651d4ad39c01a3c450e809cef44a3efd039fc322 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -310,6 +310,7 @@ public class PurpurWorldConfig {
@@ -27,9 +27,9 @@ index 44ffdbe9fa16ab111e2f598a47ba54194d4d94dd..39496742ed05737029e67592755cd743
public boolean creativeOnePunch = false;
+ public boolean playerSleepNearMonsters = false;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -324,6 +325,7 @@ public class PurpurWorldConfig {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -329,6 +330,7 @@ public class PurpurWorldConfig {
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);

6
patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch
View File

@@ -18,10 +18,10 @@ index 5718b5941dc63987bad30efe5377476c60095b99..31384fc12fd8af92c27c709b8c1ea33d
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 39496742ed05737029e67592755cd74331e1cb95..264d6902931377c55fcbdeb32460648802f56133 100644
index 651d4ad39c01a3c450e809cef44a3efd039fc322..4b37968f84812352f88663de61fee1756965a50e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -917,6 +917,8 @@ public class PurpurWorldConfig {
@@ -922,6 +922,8 @@ public class PurpurWorldConfig {
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index 39496742ed05737029e67592755cd74331e1cb95..264d6902931377c55fcbdeb324606488
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -925,11 +927,17 @@ public class PurpurWorldConfig {
@@ -930,11 +932,17 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max-health", null);
set("mobs.enderman.attributes.max_health", oldValue);
}

6
patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
View File

@@ -20,10 +20,10 @@ index 31384fc12fd8af92c27c709b8c1ea33d1a035eee..3e15f892f210611edf68dc56b912be5b
} else {
Vec3 vec3d = player.getViewVector(1.0F).normalize();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 264d6902931377c55fcbdeb32460648802f56133..0f7a3541425a825007cb3deaafaaf386cf4b76ba 100644
index 4b37968f84812352f88663de61fee1756965a50e..3bab607ae94afa2a02ae501f386e5797b78871cc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -919,6 +919,8 @@ public class PurpurWorldConfig {
@@ -924,6 +924,8 @@ public class PurpurWorldConfig {
public boolean endermanTakeDamageFromWater = true;
public boolean endermanAggroEndermites = true;
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
@@ -32,7 +32,7 @@ index 264d6902931377c55fcbdeb32460648802f56133..0f7a3541425a825007cb3deaafaaf386
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -938,6 +940,8 @@ public class PurpurWorldConfig {
@@ -943,6 +945,8 @@ public class PurpurWorldConfig {
endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);

6
patches/server/0169-Tick-fluids-config.patch
View File

@@ -36,10 +36,10 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0f7a3541425a825007cb3deaafaaf386cf4b76ba..e2a6db623c662b6604c204570b2c0bc927989c3d 100644
index 3bab607ae94afa2a02ae501f386e5797b78871cc..0e1f348aacc42b8ad13f18b0f151433f24ab8e42 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -401,6 +401,7 @@ public class PurpurWorldConfig {
@@ -406,6 +406,7 @@ public class PurpurWorldConfig {
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
public boolean projectilesBypassMobGriefing = false;
@@ -47,7 +47,7 @@ index 0f7a3541425a825007cb3deaafaaf386cf4b76ba..e2a6db623c662b6604c204570b2c0bc9
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -421,6 +422,7 @@ public class PurpurWorldConfig {
@@ -426,6 +427,7 @@ public class PurpurWorldConfig {
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing);

6
patches/server/0170-Config-to-disable-Llama-caravans.patch
View File

@@ -32,10 +32,10 @@ index 93a05b945ac248df0ea7a0b9d7264a9c129c3bcf..8f12851f220bb23102f52f523a4c5d98
this.caravanHead.caravanTail = this;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e2a6db623c662b6604c204570b2c0bc927989c3d..1b3b2a94cd33661c913706a297e6660cf7c93086 100644
index 0e1f348aacc42b8ad13f18b0f151433f24ab8e42..cba258c7fdbb844e4205fec426b2f80ecccdc831 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1185,6 +1185,7 @@ public class PurpurWorldConfig {
@@ -1190,6 +1190,7 @@ public class PurpurWorldConfig {
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
public int llamaBreedingTicks = 6000;
@@ -43,7 +43,7 @@ index e2a6db623c662b6604c204570b2c0bc927989c3d..1b3b2a94cd33661c913706a297e6660c
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1202,6 +1203,7 @@ public class PurpurWorldConfig {
@@ -1207,6 +1208,7 @@ public class PurpurWorldConfig {
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);

6
patches/server/0171-Config-to-make-Creepers-explode-on-death.patch
View File

@@ -50,10 +50,10 @@ index c550b8c19837ed9bf730a3eb777bc00de4e7ceb2..02494dcc8a342f65b2855612aebeb019
private void spawnLingeringCloud() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1b3b2a94cd33661c913706a297e6660cf7c93086..580f2a28adc946643951d16403ff53ebccbe7982 100644
index cba258c7fdbb844e4205fec426b2f80ecccdc831..3537c044d0a5542939d596d8e6c30e09ad75cbbc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -792,6 +792,7 @@ public class PurpurWorldConfig {
@@ -797,6 +797,7 @@ public class PurpurWorldConfig {
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
@@ -61,7 +61,7 @@ index 1b3b2a94cd33661c913706a297e6660cf7c93086..580f2a28adc946643951d16403ff53eb
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -804,6 +805,7 @@ public class PurpurWorldConfig {
@@ -809,6 +810,7 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);

6
patches/server/0172-Configurable-ravager-griefable-blocks-list.patch
View File

@@ -31,10 +31,10 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 580f2a28adc946643951d16403ff53ebccbe7982..e5f648e5b7041218f03d3fff0d755c29563c0e8d 100644
index 3537c044d0a5542939d596d8e6c30e09ad75cbbc..c9bebc201fdf944281e75ff0f614be845c3e8823 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1495,6 +1495,7 @@ public class PurpurWorldConfig {
@@ -1500,6 +1500,7 @@ public class PurpurWorldConfig {
public boolean ravagerRidableInWater = false;
public double ravagerMaxHealth = 100.0D;
public boolean ravagerBypassMobGriefing = false;
@@ -42,7 +42,7 @@ index 580f2a28adc946643951d16403ff53ebccbe7982..e5f648e5b7041218f03d3fff0d755c29
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1505,6 +1506,23 @@ public class PurpurWorldConfig {
@@ -1510,6 +1511,23 @@ public class PurpurWorldConfig {
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);

4
patches/server/0173-Sneak-to-bulk-process-composter.patch
View File

@@ -75,10 +75,10 @@ index 4c9ae6bdb2f0358798f84928271a2d783dcba7b4..47bf769a031ae39cc72d2191195d1378
int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e5f648e5b7041218f03d3fff0d755c29563c0e8d..9560ed69f0a17a78cc7129b64499a6c4de55a434 100644
index c9bebc201fdf944281e75ff0f614be845c3e8823..d9bd87e63f5f9e0dc3c7e5c0855625e12bb4f7e2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -485,6 +485,11 @@ public class PurpurWorldConfig {
@@ -490,6 +490,11 @@ public class PurpurWorldConfig {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
}

8
patches/server/0174-Config-for-skipping-night.patch
View File

@@ -18,7 +18,7 @@ index 33ee5844fed6cca2aecf8b84b03c396b445ba0c2..54c353224ae3e72544af2a34304039b5
long l = this.levelData.getDayTime() + 24000L;
TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime());
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9560ed69f0a17a78cc7129b64499a6c4de55a434..30e1679f4d342634fdfd8c64520d9c87eeee1462 100644
index d9bd87e63f5f9e0dc3c7e5c0855625e12bb4f7e2..cbf2c803de7b256550c748eba8c110e3f6c61edb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -311,6 +311,7 @@ public class PurpurWorldConfig {
@@ -27,9 +27,9 @@ index 9560ed69f0a17a78cc7129b64499a6c4de55a434..30e1679f4d342634fdfd8c64520d9c87
public boolean playerSleepNearMonsters = false;
+ public boolean playersSkipNight = true;
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -326,6 +327,7 @@ public class PurpurWorldConfig {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -331,6 +332,7 @@ public class PurpurWorldConfig {
playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);

Some files were not shown because too many files have changed in this diff Show More