Added the rest of disguisable entitys. Fixed crashes

This commit is contained in:
Andrew
2013-05-20 23:00:59 +12:00
parent 6b8bce622d
commit 0c6d1c9280
18 changed files with 241 additions and 64 deletions

View File

@@ -3,8 +3,6 @@ package me.libraryaddict.disguise;
import java.util.List;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.MiscDisguise;
import me.libraryaddict.disguise.DisguiseTypes.MobDisguise;
import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise;
import net.minecraft.server.v1_5_R3.WatchableObject;
@@ -21,11 +19,13 @@ import com.comphenix.protocol.reflect.StructureModifier;
public class LibsDisguises extends JavaPlugin {
@Override
public void onEnable() {
getCommand("disguise").setExecutor(new DisguiseCommand());
ProtocolLibrary.getProtocolManager().addPacketListener(
new PacketAdapter(this, ConnectionSide.SERVER_SIDE, ListenerPriority.NORMAL, Packets.Server.NAMED_ENTITY_SPAWN,
Packets.Server.ENTITY_METADATA) {
@Override
public void onPacketSending(PacketEvent event) {
StructureModifier<Object> mods = event.getPacket().getModifier();
try {
@@ -36,22 +36,20 @@ public class LibsDisguises extends JavaPlugin {
if (DisguiseAPI.isDisguised(watched.getName())) {
Disguise disguise = DisguiseAPI.getDisguise(watched);
if (event.getPacketID() == Packets.Server.NAMED_ENTITY_SPAWN) {
if (disguise.getType().isMob()) {
event.setCancelled(true);
DisguiseAPI.disguiseToPlayer(watched, observer, (MobDisguise) disguise);
} else if (disguise.getType().isMisc()) {
event.setCancelled(true);
DisguiseAPI.disguiseToPlayer(watched, observer, (MiscDisguise) disguise);
} else if (disguise.getType().isPlayer()) {
if (disguise.getType().isPlayer()) {
String name = (String) mods.read(1);
if (!name.equals(((PlayerDisguise) disguise).getName())) {
event.setCancelled(true);
DisguiseAPI.disguiseToPlayer(watched, observer, (PlayerDisguise) disguise);
DisguiseAPI.disguiseToPlayer(watched, observer, disguise);
}
} else {
event.setCancelled(true);
DisguiseAPI.disguiseToPlayer(watched, observer, disguise);
}
} else if (!disguise.getType().isPlayer()) {
if (disguise.hasWatcher())
if (disguise.hasWatcher()) {
mods.write(1, disguise.getWatcher().convert((List<WatchableObject>) mods.read(1)));
}
}
}
}