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

@@ -59,7 +59,7 @@ index 3927087d5cea154c2e8dba370fea47bdba65d05d..a90ec8363a41033db421d42896e7203e
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 5665689a93b3feb1c3622c9447f07a22cb57bbe8..312d29bc2fff8553fd2b58b0b89670d336bcc79d 100644
index 021d2ba371303bc5de0d0b30dfc5332de39d179f..6c158fefeef4634d41816fe00c721cefaf7d7455 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -263,6 +263,11 @@ public class PurpurConfig {
@@ -89,10 +89,10 @@ index 5665689a93b3feb1c3622c9447f07a22cb57bbe8..312d29bc2fff8553fd2b58b0b89670d3
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bdf2ebb27cc67da95930c9971de3cf2e66bb14d3..1686fb653f35cfd42364a61012b47724ccea115f 100644
index 4cc629ee614c4ff43181af6992786c4eac190f5a..26d9943ada0bec112c5fc1ccc67d1af2a5308001 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -214,6 +214,7 @@ public class PurpurWorldConfig {
@@ -217,6 +217,7 @@ public class PurpurWorldConfig {
public float enderPearlEndermiteChance = 0.05F;
public int glowBerriesEatGlowDuration = 0;
public boolean shulkerBoxItemDropContentsWhenDestroyed = true;
@@ -100,7 +100,7 @@ index bdf2ebb27cc67da95930c9971de3cf2e66bb14d3..1686fb653f35cfd42364a61012b47724
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -259,6 +260,7 @@ public class PurpurWorldConfig {
@@ -262,6 +263,7 @@ public class PurpurWorldConfig {
enderPearlEndermiteChance = (float) getDouble("gameplay-mechanics.item.ender-pearl.endermite-spawn-chance", enderPearlEndermiteChance);
glowBerriesEatGlowDuration = getInt("gameplay-mechanics.item.glow_berries.eat-glow-duration", glowBerriesEatGlowDuration);
shulkerBoxItemDropContentsWhenDestroyed = getBoolean("gameplay-mechanics.item.shulker_box.drop-contents-when-destroyed", shulkerBoxItemDropContentsWhenDestroyed);