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

Typo

Browse Source
This commit is contained in:
William Blake Galbreath
2020-10-20 15:30:20 -05:00
parent e8bb90cf36
commit 4beb3d1768
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow infinite and mending enchantments together
diff --git a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java diff --git a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
index 408cfa460..78dc2d925 100644 index 408cfa460..3d4e34f70 100644
--- a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java --- a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
+++ b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java +++ b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
@@ -23,6 +23,6 @@ public class EnchantmentInfiniteArrows extends Enchantment { @@ -23,6 +23,6 @@ public class EnchantmentInfiniteArrows extends Enchantment {
@@ -13,20 +13,36 @@ index 408cfa460..78dc2d925 100644
@Override @Override
public boolean a(Enchantment enchantment) { public boolean a(Enchantment enchantment) {
- return enchantment instanceof EnchantmentMending ? false : super.a(enchantment); - return enchantment instanceof EnchantmentMending ? false : super.a(enchantment);
+ return enchantment instanceof EnchantmentMending ? net.pl3x.purpur.PurpurConfig.allowInfiniteMending : super.a(enchantment); // Purpur + return enchantment instanceof EnchantmentMending ? net.pl3x.purpur.PurpurConfig.allowInfinityMending : super.a(enchantment); // Purpur
} }
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d33d24af6..aea57edcc 100644 index d33d24af6..418fc8390 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -194,6 +194,11 @@ public class PurpurConfig { @@ -55,8 +55,8 @@ public class PurpurConfig {
commands = new HashMap<>();
commands.put("purpur", new PurpurCommand("purpur"));
- version = getInt("config-version", 4);
- set("config-version", 4);
+ version = getInt("config-version", 5);
+ set("config-version", 5);
readConfig(PurpurConfig.class, null);
}
@@ -194,6 +194,16 @@ public class PurpurConfig {
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame); cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
} }
+ public static boolean allowInfiniteMending = false; + public static boolean allowInfinityMending = false;
+ private static void enchantmentSettings() { + private static void enchantmentSettings() {
+ allowInfiniteMending = getBoolean("settings.enchantment.allow-infinite-and-mending-together", allowInfiniteMending); + if (version < 5) {
+ boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
+ set("settings.enchantment.allow-infinity-and-mending-together", oldValue);
+ set("settings.enchantment.allow-infinite-and-mending-together", null);
+ }
+ allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
+ } + }
+ +
public static boolean endermanShortHeight = false; public static boolean endermanShortHeight = false;