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

Drop projectile despawn rates patch in favor of pufferfish's

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0256-Allow-void-trading.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow void trading
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 9b425b9443e491dc832548f5dc733bf3d29da801..1182e5b5015153b55eb3e74b3ae466e260566954 100644
index 692fa17277cf89aebb3d98269e6b0e8271feb0ba..e352904cb790b3253ec30753e66a70507c0d748c 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2681,7 +2681,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,10 +18,10 @@ index 9b425b9443e491dc832548f5dc733bf3d29da801..1182e5b5015153b55eb3e74b3ae466e2
}
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index bfa029905775534a5ac5d01aa0085c4f08de4cf9..f187872e96f41e5c97c9f1bc71c859310769f914 100644
index 6f14dac3a428e8d982a172c5c510e424cf09ecf6..7dcbf902937d05062f49f66ea6a09ec608111539 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -414,6 +414,7 @@ public class PurpurWorldConfig {
@@ -417,6 +417,7 @@ public class PurpurWorldConfig {
public boolean playerRemoveBindingWithWeakness = false;
public int shiftRightClickRepairsMendingPoints = 0;
public int playerExpPickupDelay = 2;
@@ -29,11 +29,11 @@ index bfa029905775534a5ac5d01aa0085c4f08de4cf9..f187872e96f41e5c97c9f1bc71c85931
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -443,6 +444,7 @@ public class PurpurWorldConfig {
@@ -446,6 +447,7 @@ public class PurpurWorldConfig {
playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);
playerExpPickupDelay = getInt("gameplay-mechanics.player.exp-pickup-delay-ticks", playerExpPickupDelay);
+ playerVoidTrading = getBoolean("gameplay-mechanics.player.allow-void-trading", playerVoidTrading);
}
public int snowballDamage = -1;
private static boolean projectileDespawnRateSettingsMigrated = false;