Further work on items

This commit is contained in:
Matthew Miller
2018-06-14 11:55:02 +10:00
parent 001a3544fb
commit 1cc735e359
11 changed files with 36 additions and 57 deletions

View File

@ -290,7 +290,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
return "";
}
Tag idTag = nbtData.getValue().get("id");
if (idTag != null && idTag instanceof StringTag) {
if (idTag instanceof StringTag) {
return ((StringTag) idTag).getValue();
} else {
return "";
@ -413,7 +413,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
* @return true if equal
*/
public boolean equalsFuzzy(BaseBlock o) {
return (getType() == o.getType()) && (getData() == o.getData() || getData() == -1 || o.getData() == -1);
return (getType().equals(o.getType())) && (getData() == o.getData() || getData() == -1 || o.getData() == -1);
}
/**