From bbd877100f297409c1769549acd260da19d98aaf Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Mon, 21 Feb 2022 19:10:12 +0100 Subject: [PATCH] Reimplements #toString, #equals, #hashCode in UAnvil --- .../ultimaterepairing/anvil/UAnvil.java | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/songoda/ultimaterepairing/anvil/UAnvil.java b/src/main/java/com/songoda/ultimaterepairing/anvil/UAnvil.java index a1fe650..400d4f0 100644 --- a/src/main/java/com/songoda/ultimaterepairing/anvil/UAnvil.java +++ b/src/main/java/com/songoda/ultimaterepairing/anvil/UAnvil.java @@ -108,33 +108,38 @@ public class UAnvil { return location.getWorld(); } - @Override - public int hashCode() { - return 31 * (location == null ? 0 : location.hashCode()); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (!(obj instanceof UAnvil)) return false; - - UAnvil other = (UAnvil) obj; - return Objects.equals(location, other.location); - } - public boolean shouldSave() { return hologram || particles || infinity || permPlaced; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + UAnvil uAnvil = (UAnvil) o; + + return hologram == uAnvil.hologram && + particles == uAnvil.particles && + infinity == uAnvil.infinity && + permPlaced == uAnvil.permPlaced && + Objects.equals(hologramId, uAnvil.hologramId) && + Objects.equals(location, uAnvil.location); + } + + @Override + public int hashCode() { + return Objects.hash(hologramId, location, hologram, particles, infinity, permPlaced); + } + @Override public String toString() { - return "UAnvil:{" - + "Location:{" - + "World:\"" + location.getWorld().getName() + "\"," - + "X:" + location.getBlockX() + "," - + "Y:" + location.getBlockY() + "," - + "Z:" + location.getBlockZ() - + "}" - + "}"; + return "UAnvil{" + + "hologramId='" + hologramId + '\'' + + ", location=" + location + + ", hologram=" + hologram + + ", particles=" + particles + + ", infinity=" + infinity + + ", permPlaced=" + permPlaced + + '}'; } }