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

@@ -58,10 +58,10 @@ index 42f79d418ec4e2dbeac9a217d9dc144cda2ef714..250c0e31825f772d3fee7a523f150cb2
return InteractionResultHolder.fail(itemStack);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 901da4d174761d3fded38c9228d738934f338998..027378dd64551ca29422235f804aa21e3546d7c8 100644
index 481f59adbd5c93629a681988cf288e267e8982cb..bcb891f2530bcbfd7860e9f2bdf0a4b8e4a145f4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -383,6 +383,8 @@ public class PurpurWorldConfig {
@@ -386,6 +386,8 @@ public class PurpurWorldConfig {
public boolean playersSkipNight = true;
public double playerCriticalDamageMultiplier = 1.5D;
public boolean playerBurpWhenFull = false;
@@ -70,7 +70,7 @@ index 901da4d174761d3fded38c9228d738934f338998..027378dd64551ca29422235f804aa21e
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -406,6 +408,8 @@ public class PurpurWorldConfig {
@@ -409,6 +411,8 @@ public class PurpurWorldConfig {
playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);
playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
@@ -78,4 +78,4 @@ index 901da4d174761d3fded38c9228d738934f338998..027378dd64551ca29422235f804aa21e
+ playerArmorSwappingCreativeMakesCopy = getBoolean("gameplay-mechanics.player.armor-click-equip.creative-makes-copy", playerArmorSwappingCreativeMakesCopy);
}
public int snowballDamage = -1;
private static boolean projectileDespawnRateSettingsMigrated = false;