Add config toggle to arrow despawn reset patch

This commit is contained in:
Encode42
2022-07-19 23:42:56 -04:00
parent ebfdfe67ad
commit 3316c894de
133 changed files with 765 additions and 749 deletions

View File

@@ -17,7 +17,7 @@ index 2fbb65c685ac88c77d54f27a5981a132fb44e370..d0ca327337206a64609c1b6ee652cf99
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8960cd89201758e325fb23bd15583af5bec39d7b..aace490037331f3ab59f2d13f6eecb3cf5ddfe80 100644
index cc2b8be3eb4f51075784816a7696d2dca9ae6bea..b95685e13130a214165acccbe287c249ca73f1bf 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -59,7 +59,7 @@ index 8960cd89201758e325fb23bd15583af5bec39d7b..aace490037331f3ab59f2d13f6eecb3c
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index ead823c2efe352d7c62daa491dd8c148c5dc9ab2..5c1da692d6ba145e5c9d08c17f69dbd4661a9ddb 100644
index c1b7b01c7588cffed238143617dcf2f48a0b241a..c36321f395c7845c73541fa1eb320da7b12ad071 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 ead823c2efe352d7c62daa491dd8c148c5dc9ab2..5c1da692d6ba145e5c9d08c17f69dbd4
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 0b1c5a91568c2e7667dc04665ee89436d0fb92ad..837ea79e092ad00749ce6a5bead3a2a3bd42618f 100644
index 90c70d233327615004fc22cde6b9d71660bb0a5b..64340213b2122ddc2e39eeac628b69d6f87c7a8f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -217,6 +217,7 @@ public class PurpurWorldConfig {
@@ -222,6 +222,7 @@ public class PurpurWorldConfig {
public float enderPearlEndermiteChance = 0.05F;
public int glowBerriesEatGlowDuration = 0;
public boolean shulkerBoxItemDropContentsWhenDestroyed = true;
@@ -100,7 +100,7 @@ index 0b1c5a91568c2e7667dc04665ee89436d0fb92ad..837ea79e092ad00749ce6a5bead3a2a3
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -262,6 +263,7 @@ public class PurpurWorldConfig {
@@ -267,6 +268,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);