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

Allow sendData of multiple data

Browse Source
This commit is contained in:
libraryaddict
2014-05-23 16:51:00 +12:00
parent 9e4ad0ba8e
commit bff21ab039
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
View File

@@ -229,23 +229,27 @@ public class FlagWatcher {
}
}
protected void sendData(int data) {
protected void sendData(int... dataValues) {
if (!DisguiseAPI.isDisguiseInUse(getDisguise()))
return;
if (!entityValues.containsKey(data) || entityValues.get(data) == null)
return;
Object value = entityValues.get(data);
List<WrappedWatchableObject> list = new ArrayList<WrappedWatchableObject>();
list.add(new WrappedWatchableObject(data, value));
PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
StructureModifier<Object> mods = packet.getModifier();
mods.write(0, getDisguise().getEntity().getEntityId());
packet.getWatchableCollectionModifier().write(0, list);
for (Player player : DisguiseUtilities.getPerverts(getDisguise())) {
try {
ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet);
} catch (InvocationTargetException e) {
e.printStackTrace();
for (int data : dataValues) {
if (!entityValues.containsKey(data) || entityValues.get(data) == null)
continue;
Object value = entityValues.get(data);
list.add(new WrappedWatchableObject(data, value));
}
if (!list.isEmpty()) {
PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
StructureModifier<Object> mods = packet.getModifier();
mods.write(0, getDisguise().getEntity().getEntityId());
packet.getWatchableCollectionModifier().write(0, list);
for (Player player : DisguiseUtilities.getPerverts(getDisguise())) {
try {
ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet);
} catch (InvocationTargetException e) {
e.printStackTrace();
}
}
}
}

4
src/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java
View File

@@ -42,8 +42,8 @@ public class TameableWatcher extends AgeableWatcher {
@Override
public void setHealth(float newHealth) {
setValue(18, newHealth);
sendData(18);
super.setHealth(newHealth);
setValue(6, newHealth);
sendData(6, 18);
}
public void setOwner(String owner) {