Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-15 08:28:33 +02:00
Code Issues Projects Releases Wiki Activity

Better material checking in 1.12-

Browse Source
This commit is contained in:
Esophose 2019-08-15 00:36:17 -06:00
parent 33d589387f
commit 55c5dcbd05
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
FabledSkyBlock/Core/src/main/java/me/goodandevil/skyblock/utils/version/Materials.java
View File

@ -1131,24 +1131,37 @@ public enum Materials {
Materials pmat = null; Materials pmat = null;
// Try 1.13+ names
for (Materials mat : Materials.values()) { for (Materials mat : Materials.values()) {
if (name.equalsIgnoreCase(mat.old12Mat)) { if (name.equalsIgnoreCase(mat.name())) {
if (pmat == null) { if (pmat == null) {
pmat = mat; pmat = mat;
} }
if (((byte) mat.data) == data) { if (((byte) mat.data) == data) {
cachedSearch.put(mat.old12Mat + "," + data, mat); cachedSearch.put(mat.name() + "," + data, mat);
return mat; return mat;
} }
} }
} }
if (pmat != null) { // Try 1.12- names
return pmat; for (Materials mat : Materials.values()) {
if (name.equalsIgnoreCase(mat.name()))
if (name.equalsIgnoreCase(mat.old12Mat)) {
if (pmat == null) {
pmat = mat;
}
if (((byte) mat.data) == data) {
cachedSearch.put(mat.old12Mat + "," + data, mat);
return mat;
}
}
} }
return null; return pmat;
} }
public boolean isSpawner() { public boolean isSpawner() {
@ -1233,7 +1246,7 @@ public enum Materials {
case "CHESTPLATE": case "CHESTPLATE":
return true; return true;
default: default:
return false; return false;
} }
} }