AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-15 18:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix item reading for items with damage (parameter ignoreMetaData (damage))

Browse Source
This commit is contained in:
Bixilon 2020-06-30 20:34:44 +02:00
parent 9e44d10566
commit 71260dbb3c
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/de/bixilon/minosoft/game/datatypes/entities/Items.java
View File

@ -987,6 +987,7 @@ public enum Items {
final Identifier identifier;
final int legacyId;
final boolean ignoreMetaData;
int legacyData;
// legacy id -2 means: 1.13+
@ -994,24 +995,13 @@ public enum Items {
this.identifier = identifier;
this.legacyId = legacyId;
this.legacyData = legacyData;
ignoreMetaData = false;
}
Items(Identifier identifier, int legacyId) {
this.identifier = identifier;
this.legacyId = legacyId;
}
public Identifier getIdentifier() {
return identifier;
}
public int getLegacyId() {
return legacyId;
}
public int getLegacyData() {
return legacyData;
ignoreMetaData = true;
}
public static Items byIdentifier(Identifier identifier) {
@ -1024,9 +1014,13 @@ public enum Items {
}
public static Items byLegacy(int id, int data) {
for (Items b : values()) {
if (b.getLegacyId() == id && b.getLegacyData() == data) {
return b;
for (Items item : values()) {
if (item.getLegacyId() == id) {
if (item.ignoreMetaData) {
return item;
} else if (item.getLegacyData() == data) {
return item;
}
}
}
return UNKNOWN;
@ -1036,5 +1030,17 @@ public enum Items {
return byLegacy(id, 0);
}
public Identifier getIdentifier() {
return identifier;
}
public int getLegacyId() {
return legacyId;
}
public int getLegacyData() {
return legacyData;
}
}