Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-26 12:35:28 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue when some enchantments are merged into another one

Browse Source 
Fixes #816
This commit is contained in:
montlikadani 2020-06-10 15:10:13 +02:00
parent 3dbfe379aa
commit b56a99526f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gamingmesh/jobs/CMILib/CMIEnchantment.java
View File

@ -49,11 +49,11 @@ public enum CMIEnchantment {
UNBREAKING("DURABILITY"),
VANISHING_CURSE;
private static HashMap<String, CMIEnchantment> map = new HashMap<String, CMIEnchantment>();
private static HashMap<Enchantment, CMIEnchantment> emap = new HashMap<Enchantment, CMIEnchantment>();
private static HashMap<String, CMIEnchantment> map = new HashMap<>();
private static HashMap<Enchantment, CMIEnchantment> emap = new HashMap<>();
private List<String> subName = new ArrayList<String>();
private List<String> customNames = new ArrayList<String>();
private List<String> subName = new ArrayList<>();
private List<String> customNames = new ArrayList<>();
private Enchantment enchantment;
@SuppressWarnings("deprecation")
@ -83,7 +83,7 @@ public enum CMIEnchantment {
// Worst case scenario
if (enchantment == null) {
for (Enchantment one : Enchantment.values()) {
if (one.toString().toLowerCase().replace("_", "").contains(temp)) {
if (one.toString().toLowerCase().replace("_", "").equalsIgnoreCase(temp)) {
enchantment = one;
break;
}
@ -95,7 +95,7 @@ public enum CMIEnchantment {
en: for (Enchantment one : Enchantment.values()) {
for (String subs : this.subName) {
try {
if (one.getName().toLowerCase().replace("_", "").contains(subs.toLowerCase().replace("_", ""))) {
if (one.getName().toLowerCase().replace("_", "").equalsIgnoreCase(subs.toLowerCase().replace("_", ""))) {
enchantment = one;
break en;
}
@ -115,7 +115,7 @@ public enum CMIEnchantment {
if (enchantment == null) {
o: for (Enchantment one : Enchantment.values()) {
for (String subs : this.subName) {
if (one.toString().toLowerCase().replace("_", "").contains(subs.toLowerCase().replace("_", ""))) {
if (one.toString().toLowerCase().replace("_", "").equalsIgnoreCase(subs.toLowerCase().replace("_", ""))) {
enchantment = one;
break o;
}