SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sort by name

Browse Source
This commit is contained in:
Andrew 2013-07-23 02:18:34 +12:00
parent 88e6fc1512
commit b34033d942
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/me/libraryaddict/disguise/DisguiseTypes/Disguise.java
View File

@ -59,16 +59,6 @@ public class Disguise {
return disguise; return disguise;
} }
public boolean equals(Disguise disguise) {
if (getType() != disguise.getType())
return false;
if (replaceSounds() != disguise.replaceSounds())
return false;
if (!getWatcher().equals(disguise.getWatcher()))
return false;
return true;
}
public PacketContainer[] constructPacket(org.bukkit.entity.Entity e) { public PacketContainer[] constructPacket(org.bukkit.entity.Entity e) {
PacketContainer[] spawnPackets = new PacketContainer[2]; PacketContainer[] spawnPackets = new PacketContainer[2];
ProtocolManager manager = ProtocolLibrary.getProtocolManager(); ProtocolManager manager = ProtocolLibrary.getProtocolManager();
@ -505,6 +495,16 @@ public class Disguise {
runnable.runTaskTimer(plugin, 1, 1); runnable.runTaskTimer(plugin, 1, 1);
} }
public boolean equals(Disguise disguise) {
if (getType() != disguise.getType())
return false;
if (replaceSounds() != disguise.replaceSounds())
return false;
if (!getWatcher().equals(disguise.getWatcher()))
return false;
return true;
}
public org.bukkit.entity.Entity getEntity() { public org.bukkit.entity.Entity getEntity() {
return entity; return entity;
} }

10
src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java
View File

@ -100,8 +100,8 @@ public enum DisguiseSound {
} }
private HashSet<String> cancelSounds = new HashSet<String>(); private HashSet<String> cancelSounds = new HashSet<String>();
private HashMap<SoundType, String> disguiseSounds = new HashMap<SoundType, String>();
private float damageSoundVolume = 1F; private float damageSoundVolume = 1F;
private HashMap<SoundType, String> disguiseSounds = new HashMap<SoundType, String>();
DisguiseSound(Object... sounds) { DisguiseSound(Object... sounds) {
for (int i = 0; i < sounds.length; i++) { for (int i = 0; i < sounds.length; i++) {
@ -135,10 +135,6 @@ public enum DisguiseSound {
} }
} }
public void setDamageSoundVolume(float strength) {
this.damageSoundVolume = strength;
}
public float getDamageSoundVolume() { public float getDamageSoundVolume() {
return damageSoundVolume; return damageSoundVolume;
} }
@ -181,4 +177,8 @@ public enum DisguiseSound {
public boolean isCancelSound(String sound) { public boolean isCancelSound(String sound) {
return getSoundsToCancel().contains(sound); return getSoundsToCancel().contains(sound);
} }
public void setDamageSoundVolume(float strength) {
this.damageSoundVolume = strength;
}
} }

8
src/me/libraryaddict/disguise/DisguiseTypes/FlagWatcher.java
View File

@ -38,10 +38,6 @@ public class FlagWatcher {
this.disguise = disguise; this.disguise = disguise;
} }
public boolean equals(FlagWatcher flagWatcher) {
return entityValues.equals(flagWatcher.entityValues);
}
public FlagWatcher clone() { public FlagWatcher clone() {
FlagWatcher cloned = new FlagWatcher(disguise); FlagWatcher cloned = new FlagWatcher(disguise);
cloned.entityValues = (HashMap<Integer, Object>) entityValues.clone(); cloned.entityValues = (HashMap<Integer, Object>) entityValues.clone();
@ -91,6 +87,10 @@ public class FlagWatcher {
return newList; return newList;
} }
public boolean equals(FlagWatcher flagWatcher) {
return entityValues.equals(flagWatcher.entityValues);
}
private boolean getFlag(int i) { private boolean getFlag(int i) {
return ((Byte) getValue(0, (byte) 0) & 1 << i) != 0; return ((Byte) getValue(0, (byte) 0) & 1 << i) != 0;
} }