mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-22 11:18:15 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: fb36f15d6 Let some more packets be send immediately, closes #4140 (#4896) ede41fe16 Emancipate more features to PlayerHandshakeEvent 3fdeba1f5 [CI-SKIP] [Auto] Rebuild Patches 5fc07bd63 Maded Title-Objects directy sendable to targets e7b9a478e Player Chunk Load/Unload Events 1d0cfc0cc MC-4 Fix item position desync 458db6206 Limit auto recipe packets
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: jmp <jasonpenilla2@me.com>
|
||||
Date: Wed, 2 Dec 2020 14:49:10 -0800
|
||||
Subject: [PATCH] Config migration: climbing should not bypass cramming
|
||||
gamerule
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 4ece8e25b66d4eea627f4d17e74e9605ad6e8ae4..669b427459a070088ce641004a4074504f7202f7 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -142,6 +142,17 @@ public class PurpurConfig {
|
||||
}
|
||||
}
|
||||
|
||||
+ private static void migrateClimbingCrammingFix() {
|
||||
+ if (PurpurConfig.version < 7) {
|
||||
+ final boolean climbingCrammingFix = getBoolean("world-settings.default.gameplay-mechanics.fix-climbing-bypassing-cramming-rule", false);
|
||||
+ set("world-settings.default.gameplay-mechanics.fix-climbing-bypassing-cramming-rule", null);
|
||||
+ if (climbingCrammingFix) {
|
||||
+ PaperConfig.config.set("world-settings.default.fix-climbing-bypassing-cramming-rule", true);
|
||||
+ PaperConfig.saveConfig();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
public static String afkBroadcastAway = "§e§o%s is now AFK";
|
||||
public static String afkBroadcastBack = "§e§o%s is no longer AFK";
|
||||
public static String afkTabListPrefix = "[AFK] ";
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 7f40f118723e04491d48227304fb7b1758ed7d0e..f57d0e48fbf8ff54f1a033ccb2302c29038c3a09 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -96,6 +96,17 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
}
|
||||
|
||||
+ private void migrateClimbingCrammingFix() {
|
||||
+ if (PurpurConfig.version < 7) {
|
||||
+ final boolean climbingCrammingFix = PurpurConfig.config.getBoolean("world-settings." + worldName + ".gameplay-mechanics.fix-climbing-bypassing-cramming-rule", false);
|
||||
+ PurpurConfig.config.set("world-settings." + worldName + ".gameplay-mechanics.fix-climbing-bypassing-cramming-rule", null);
|
||||
+ if (climbingCrammingFix) {
|
||||
+ PaperConfig.config.set("world-settings." + worldName + ".fix-climbing-bypassing-cramming-rule", true);
|
||||
+ PaperConfig.saveConfig();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
public boolean armorstandSetNameVisible = false;
|
||||
public boolean armorstandFixNametags = false;
|
||||
public float armorstandStepHeight = 0.0F;
|
||||
Reference in New Issue
Block a user