From abbdf4232ab63dc0889c08b00451dcccc9ce7f6c Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 6 Nov 2013 05:08:16 +1300 Subject: [PATCH] Removed .equals for all the good it does to remove it .-. --- .../disguise/disguisetypes/Disguise.java | 24 ------------------- .../disguise/disguisetypes/FlagWatcher.java | 4 ---- .../disguise/disguisetypes/MobDisguise.java | 4 ---- .../disguisetypes/PlayerDisguise.java | 4 ---- 4 files changed, 36 deletions(-) diff --git a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java index 05362782..b9c91b41 100644 --- a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java +++ b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java @@ -280,30 +280,6 @@ public class Disguise { return this; } - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Disguise other = (Disguise) obj; - if (disguiseType != other.disguiseType) - return false; - if (hearSelfDisguise != other.hearSelfDisguise) - return false; - if (replaceSounds != other.replaceSounds) - return false; - if (velocitySent != other.velocitySent) - return false; - if (viewSelfDisguise != other.viewSelfDisguise) - return false; - if (!watcher.equals(other.watcher)) - return false; - return true; - } - /** * Get the disguised entity */ diff --git a/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java index 76546342..71491f5a 100644 --- a/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java +++ b/src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java @@ -138,10 +138,6 @@ public class FlagWatcher { return newList; } - public boolean equals(FlagWatcher flagWatcher) { - return entityValues.equals(flagWatcher.entityValues); - } - public org.bukkit.inventory.ItemStack[] getArmor() { org.bukkit.inventory.ItemStack[] armor = new org.bukkit.inventory.ItemStack[4]; for (int i = 0; i < 4; i++) { diff --git a/src/me/libraryaddict/disguise/disguisetypes/MobDisguise.java b/src/me/libraryaddict/disguise/disguisetypes/MobDisguise.java index 1ff5a9c0..a757da81 100644 --- a/src/me/libraryaddict/disguise/disguisetypes/MobDisguise.java +++ b/src/me/libraryaddict/disguise/disguisetypes/MobDisguise.java @@ -57,10 +57,6 @@ public class MobDisguise extends Disguise { } - public boolean equals(MobDisguise mobDisguise) { - return isAdult == mobDisguise.isAdult && this.equals(mobDisguise); - } - public boolean isAdult() { if (getWatcher() != null) { if (getWatcher() instanceof AgeableWatcher) diff --git a/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java index 4f53bc99..436f847e 100644 --- a/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java +++ b/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java @@ -19,10 +19,6 @@ public class PlayerDisguise extends Disguise { return disguise; } - public boolean equals(PlayerDisguise playerDisguise) { - return getName().equals(playerDisguise.getName()) && this.equals(playerDisguise); - } - public String getName() { return playerName; }