Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-16 23:55:28 +01:00
Code Issues Projects Releases Wiki Activity

Improve FlatItemData#equals

Browse Source
This commit is contained in:
md678685 2018-08-27 21:02:27 +01:00
parent c1c422e03d
commit 2ddde37771
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nms/FlattenedProvider/src/net/ess3/nms/flattened/FlatItemDbProvider.java
View File

@ -183,8 +183,17 @@ public class FlatItemDbProvider extends ItemDbProvider {
return false;
}
ItemData pairo = (ItemData) o;
return this.material == pairo.getMaterial() &&
(this.potionData == null && pairo.getPotionData() == null) || this.potionData.equals(pairo.getPotionData());
return this.material == pairo.getMaterial() && potionDataEquals(pairo);
}
private boolean potionDataEquals(ItemData o) {
if (this.potionData == null && o.getPotionData() == null) {
return true;
} else if (this.potionData != null && o.getPotionData() != null) {
return this.potionData.equals(o.getPotionData());
} else {
return false;
}
}
}
}