Removed .equals for all the good it does to remove it .-.
This commit is contained in:
parent
d4ae115d19
commit
abbdf4232a
@ -280,30 +280,6 @@ public class Disguise {
|
|||||||
return this;
|
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
|
* Get the disguised entity
|
||||||
*/
|
*/
|
||||||
|
@ -138,10 +138,6 @@ public class FlagWatcher {
|
|||||||
return newList;
|
return newList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean equals(FlagWatcher flagWatcher) {
|
|
||||||
return entityValues.equals(flagWatcher.entityValues);
|
|
||||||
}
|
|
||||||
|
|
||||||
public org.bukkit.inventory.ItemStack[] getArmor() {
|
public org.bukkit.inventory.ItemStack[] getArmor() {
|
||||||
org.bukkit.inventory.ItemStack[] armor = new org.bukkit.inventory.ItemStack[4];
|
org.bukkit.inventory.ItemStack[] armor = new org.bukkit.inventory.ItemStack[4];
|
||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
|
@ -57,10 +57,6 @@ public class MobDisguise extends Disguise {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean equals(MobDisguise mobDisguise) {
|
|
||||||
return isAdult == mobDisguise.isAdult && this.equals(mobDisguise);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isAdult() {
|
public boolean isAdult() {
|
||||||
if (getWatcher() != null) {
|
if (getWatcher() != null) {
|
||||||
if (getWatcher() instanceof AgeableWatcher)
|
if (getWatcher() instanceof AgeableWatcher)
|
||||||
|
@ -19,10 +19,6 @@ public class PlayerDisguise extends Disguise {
|
|||||||
return disguise;
|
return disguise;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean equals(PlayerDisguise playerDisguise) {
|
|
||||||
return getName().equals(playerDisguise.getName()) && this.equals(playerDisguise);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return playerName;
|
return playerName;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user