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

Added clone() for the disguises, clones it auto. Fixes potential bug

Browse Source
This commit is contained in:
Andrew 2013-07-16 17:23:38 +12:00
parent 0e43fb481d
commit 823914d626
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/me/libraryaddict/disguise/DisguiseAPI.java
View File

@ -55,6 +55,8 @@ public class DisguiseAPI {
public static void disguiseToAll(Entity entity, Disguise disguise) { public static void disguiseToAll(Entity entity, Disguise disguise) {
if (disguise == null) if (disguise == null)
return; return;
if (disguise.getWatcher() != null)
disguise = disguise.clone();
put(entity instanceof Player ? ((Player) entity).getName() : entity.getUniqueId(), disguise); put(entity instanceof Player ? ((Player) entity).getName() : entity.getUniqueId(), disguise);
disguise.constructWatcher(entity.getType(), entity.getEntityId()); disguise.constructWatcher(entity.getType(), entity.getEntityId());
refresh(entity); refresh(entity);

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

@ -44,6 +44,11 @@ public class Disguise {
replaceSounds = doSounds; replaceSounds = doSounds;
} }
public Disguise clone() {
Disguise disguise = new Disguise(getType(), replaceSounds());
return disguise;
}
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();
@ -260,11 +265,11 @@ public class Disguise {
else else
tempWatcher = new FlagWatcher(entityId); tempWatcher = new FlagWatcher(entityId);
} }
if (this instanceof MobDisguise) { if (this instanceof MobDisguise && !((MobDisguise) this).isAdult()) {
if (tempWatcher instanceof AgeableWatcher) if (tempWatcher instanceof AgeableWatcher)
tempWatcher.setValue(12, ((MobDisguise) this).isAdult() ? 0 : -24000); tempWatcher.setValue(12, -24000);
else if (tempWatcher instanceof ZombieWatcher) else if (tempWatcher instanceof ZombieWatcher)
tempWatcher.setValue(12, (byte) (((MobDisguise) this).isAdult() ? 0 : 1)); tempWatcher.setValue(12, (byte) 1);
} }
HashMap<Integer, Object> disguiseValues = Values.getMetaValues(getType()); HashMap<Integer, Object> disguiseValues = Values.getMetaValues(getType());
HashMap<Integer, Object> entityValues = Values.getMetaValues(DisguiseType.getType(type)); HashMap<Integer, Object> entityValues = Values.getMetaValues(DisguiseType.getType(type));

5
src/me/libraryaddict/disguise/DisguiseTypes/MiscDisguise.java
View File

@ -26,6 +26,11 @@ public class MiscDisguise extends Disguise {
this(disguiseType, true, id, data); this(disguiseType, true, id, data);
} }
public MiscDisguise clone() {
MiscDisguise disguise = new MiscDisguise(getType(), replaceSounds(), getId(), getData());
return disguise;
}
public int getData() { public int getData() {
return data; return data;
} }

5
src/me/libraryaddict/disguise/DisguiseTypes/PlayerDisguise.java
View File

@ -14,6 +14,11 @@ public class PlayerDisguise extends Disguise {
playerName = name; playerName = name;
} }
public PlayerDisguise clone() {
PlayerDisguise disguise = new PlayerDisguise(getName(), replaceSounds());
return disguise;
}
public String getName() { public String getName() {
return playerName; return playerName;
} }