EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-16 09:03:38 +02:00
Code Issues Projects Releases Wiki Activity

fix luck of the sea being applied for super break and other abilities Fixes #5026

Browse Source
This commit is contained in:
nossr50 2024-06-28 18:28:51 -07:00
parent a11ac782fa
commit e32bde3c32
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -1,3 +1,6 @@
Version 2.2.014
Fixed a bug where Luck Of The Sea was being applied for Super Breaker (and other abilities)
Version 2.2.013 Version 2.2.013
Added Breeze to experience.yml Added Breeze to experience.yml
Added Bogged to experience.yml Added Bogged to experience.yml

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.2.013</version> <version>2.2.014-SNAPSHOT</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url> <url>https://github.com/mcMMO-Dev/mcMMO</url>
<scm> <scm>

43
src/main/java/com/gmail/nossr50/util/EnchantmentMapper.java
View File

@ -1,8 +1,13 @@
package com.gmail.nossr50.util; package com.gmail.nossr50.util;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry; import org.bukkit.Registry;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Locale;
public class EnchantmentMapper { public class EnchantmentMapper {
private final mcMMO pluginRef; private final mcMMO pluginRef;
@ -20,12 +25,18 @@ public class EnchantmentMapper {
this.featherFalling = initFeatherFalling(); this.featherFalling = initFeatherFalling();
this.luckOfTheSea = initLuckOfTheSea(); this.luckOfTheSea = initLuckOfTheSea();
} }
private static @Nullable Enchantment mockSpigotMatch(@NotNull String input) {
// Replicates match() behaviour for older versions lacking this API
final String filtered = input.toLowerCase(Locale.ROOT).replaceAll("\\s+", "_");
final NamespacedKey namespacedKey = NamespacedKey.fromString(filtered);
return (namespacedKey != null) ? Registry.ENCHANTMENT.get(namespacedKey) : null;
}
private Enchantment initLuckOfTheSea() { private Enchantment initLuckOfTheSea() {
// TODO: Make use of match if present if (mockSpigotMatch("luck_of_the_sea") != null) {
// if (Registry.ENCHANTMENT.match("luck_of_the_sea") != null) { return mockSpigotMatch("luck_of_the_sea");
// return Registry.ENCHANTMENT.match("luck_of_the_sea"); }
// }
// Look for the enchantment by name // Look for the enchantment by name
for (Enchantment enchantment : Registry.ENCHANTMENT) { for (Enchantment enchantment : Registry.ENCHANTMENT) {
@ -43,9 +54,9 @@ public class EnchantmentMapper {
} }
private Enchantment initFeatherFalling() { private Enchantment initFeatherFalling() {
// if (Registry.ENCHANTMENT.match("feather_falling") != null) { if (mockSpigotMatch("feather_falling") != null) {
// return Registry.ENCHANTMENT.match("feather_falling"); return mockSpigotMatch("feather_falling");
// } }
// Look for the enchantment by name // Look for the enchantment by name
for (Enchantment enchantment : Registry.ENCHANTMENT) { for (Enchantment enchantment : Registry.ENCHANTMENT) {
@ -63,9 +74,9 @@ public class EnchantmentMapper {
} }
private Enchantment initInfinity() { private Enchantment initInfinity() {
// if (Registry.ENCHANTMENT.match("infinity") != null) { if (mockSpigotMatch("infinity") != null) {
// return Registry.ENCHANTMENT.match("infinity"); return mockSpigotMatch("infinity");
// } }
// Look for the enchantment by name // Look for the enchantment by name
for (Enchantment enchantment : Registry.ENCHANTMENT) { for (Enchantment enchantment : Registry.ENCHANTMENT) {
@ -83,9 +94,9 @@ public class EnchantmentMapper {
} }
private Enchantment initEfficiency() { private Enchantment initEfficiency() {
// if (Registry.ENCHANTMENT.match("efficiency") != null) { if (mockSpigotMatch("efficiency") != null) {
// return Registry.ENCHANTMENT.match("efficiency"); return mockSpigotMatch("efficiency");
// } }
// Look for the enchantment by name // Look for the enchantment by name
for (Enchantment enchantment : Registry.ENCHANTMENT) { for (Enchantment enchantment : Registry.ENCHANTMENT) {
@ -103,9 +114,9 @@ public class EnchantmentMapper {
} }
private Enchantment initUnbreaking() { private Enchantment initUnbreaking() {
// if (Registry.ENCHANTMENT.match("unbreaking") != null) { if (mockSpigotMatch("unbreaking") != null) {
// return Registry.ENCHANTMENT.match("unbreaking"); return mockSpigotMatch("unbreaking");
// } }
// Look for the enchantment by name // Look for the enchantment by name
for (Enchantment enchantment : Registry.ENCHANTMENT) { for (Enchantment enchantment : Registry.ENCHANTMENT) {