Clean up code & Upgrade syntax to new Java

2022-08-07 01:35:02 +07:00
parent bbdf236a10
commit f983b4dccf
17 changed files with 44 additions and 61 deletions
--- a/src/main/java/net/server/guild/Guild.java
+++ b/src/main/java/net/server/guild/Guild.java
@@ -604,11 +604,10 @@ public class Guild {

    @Override
    public boolean equals(Object other) {
-        if (!(other instanceof GuildCharacter)) {
-            return false;
+        if (other instanceof GuildCharacter o) {
+            return (o.getId() == id && o.getName().equals(name));
        }
-        GuildCharacter o = (GuildCharacter) other;
-        return (o.getId() == id && o.getName().equals(name));
+        return false;
    }

    @Override