Drop projectile despawn rates patch in favor of pufferfish's

Fixes elBukkit/MagicPlugin#1042
Fixes elBukkit/MagicPlugin#816
This commit is contained in:
BillyGalbreath
2022-06-13 10:46:27 -05:00
parent c5dbf9cf10
commit 146750b2de
193 changed files with 978 additions and 1244 deletions

View File

@@ -29,10 +29,10 @@ index 6e7af1939df4ff99d6d4645f7ed270110d9d0373..d120c8808c6a8df2c8615fe02f2c8a5b
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1e7b7a560b12b3de0a23124c58bc73e001189d92..ab26229fc60bd81e2f0264ce3b4cda46590870de 100644
index b6fda4581fdd0b3e270e707b9b7e360c8715b15f..34bd5886b9437f2906558a6cd0b8771c66073c41 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1251,6 +1251,7 @@ public class PurpurWorldConfig {
@@ -1258,6 +1258,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -40,7 +40,7 @@ index 1e7b7a560b12b3de0a23124c58bc73e001189d92..ab26229fc60bd81e2f0264ce3b4cda46
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1268,6 +1269,7 @@ public class PurpurWorldConfig {
@@ -1275,6 +1276,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -48,7 +48,7 @@ index 1e7b7a560b12b3de0a23124c58bc73e001189d92..ab26229fc60bd81e2f0264ce3b4cda46
}
public boolean dolphinRidable = false;
@@ -2343,6 +2345,7 @@ public class PurpurWorldConfig {
@@ -2350,6 +2352,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -56,7 +56,7 @@ index 1e7b7a560b12b3de0a23124c58bc73e001189d92..ab26229fc60bd81e2f0264ce3b4cda46
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2355,6 +2358,7 @@ public class PurpurWorldConfig {
@@ -2362,6 +2365,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -64,7 +64,7 @@ index 1e7b7a560b12b3de0a23124c58bc73e001189d92..ab26229fc60bd81e2f0264ce3b4cda46
}
public boolean skeletonHorseRidableInWater = true;
@@ -2882,6 +2886,7 @@ public class PurpurWorldConfig {
@@ -2889,6 +2893,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -72,7 +72,7 @@ index 1e7b7a560b12b3de0a23124c58bc73e001189d92..ab26229fc60bd81e2f0264ce3b4cda46
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2900,6 +2905,7 @@ public class PurpurWorldConfig {
@@ -2907,6 +2912,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);