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

Resend self disguise when it goes below 0 health

Browse Source
This commit is contained in:
Andrew 2013-10-01 17:14:16 +13:00
parent 6425dbbb6c
commit 628c3544d9
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.reflect.StructureModifier; import com.comphenix.protocol.reflect.StructureModifier;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.PacketsManager;
import net.minecraft.server.v1_6_R3.ChunkCoordinates; import net.minecraft.server.v1_6_R3.ChunkCoordinates;
import net.minecraft.server.v1_6_R3.EntityPlayer; import net.minecraft.server.v1_6_R3.EntityPlayer;
import net.minecraft.server.v1_6_R3.ItemStack; import net.minecraft.server.v1_6_R3.ItemStack;
@ -51,6 +52,7 @@ public class FlagWatcher {
private Disguise disguise; private Disguise disguise;
private HashMap<Integer, Object> entityValues = new HashMap<Integer, Object>(); private HashMap<Integer, Object> entityValues = new HashMap<Integer, Object>();
private org.bukkit.inventory.ItemStack[] items = new org.bukkit.inventory.ItemStack[5]; private org.bukkit.inventory.ItemStack[] items = new org.bukkit.inventory.ItemStack[5];
private boolean hasDied;
public FlagWatcher(Disguise disguise) { public FlagWatcher(Disguise disguise) {
this.disguise = disguise; this.disguise = disguise;
@ -103,6 +105,24 @@ public class FlagWatcher {
newList.add(watch); newList.add(watch);
} }
} }
// Here we check for if there is a health packet that says they died.
if (disguise.viewSelfDisguise() && disguise.getEntity() != null && disguise.getEntity() instanceof Player) {
for (WatchableObject watch : newList) {
// Its a health packet
if (watch.a() == 6) {
Object value = watch.b();
if (value != null && value instanceof Float) {
float newHealth = (Float) value;
if (newHealth > 0 && hasDied) {
hasDied = false;
PacketsManager.sendSelfDisguise((Player) disguise.getEntity());
} else if (newHealth <= 0 && !hasDied) {
hasDied = true;
}
}
}
}
}
return newList; return newList;
} }