More stuff. Self disguises no work :(
This commit is contained in:
libraryaddict
@@ -6,10 +6,11 @@ import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
|
||||
import me.libraryaddict.disguise.DisguiseAPI;
|
||||
import me.libraryaddict.disguise.LibsDisguises;
|
||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||
import me.libraryaddict.disguise.disguisetypes.TargettedDisguise;
|
||||
import me.libraryaddict.disguise.disguisetypes.TargettedDisguise.TargetType;
|
||||
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
|
||||
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise.TargetType;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
@@ -28,13 +29,13 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher;
|
||||
|
||||
public class DisguiseUtilities {
|
||||
// Store the entity IDs instead of entitys because then I can disguise entitys even before they exist
|
||||
private static HashMap<Integer, HashSet<TargettedDisguise>> targetedDisguises = new HashMap<Integer, HashSet<TargettedDisguise>>();
|
||||
private static HashMap<Integer, HashSet<TargetedDisguise>> targetedDisguises = new HashMap<Integer, HashSet<TargetedDisguise>>();
|
||||
private static LibsDisguises libsDisguises;
|
||||
// A internal storage of fake entity ID's I can use.
|
||||
// Realistically I could probably use a ID like "4" for everyone, seeing as no one shares the ID
|
||||
private static HashMap<Integer, Integer> selfDisguisesIds = new HashMap<Integer, Integer>();
|
||||
|
||||
public static HashMap<Integer, HashSet<TargettedDisguise>> getDisguises() {
|
||||
public static HashMap<Integer, HashSet<TargetedDisguise>> getDisguises() {
|
||||
return targetedDisguises;
|
||||
}
|
||||
|
||||
@@ -47,7 +48,7 @@ public class DisguiseUtilities {
|
||||
}
|
||||
|
||||
public static boolean isDisguiseInUse(Disguise disguise) {
|
||||
if (getDisguises().containsKey(disguise.getEntity().getEntityId())
|
||||
if (disguise.getEntity() != null && getDisguises().containsKey(disguise.getEntity().getEntityId())
|
||||
&& getDisguises().get(disguise.getEntity().getEntityId()).contains(disguise)) {
|
||||
return true;
|
||||
}
|
||||
@@ -58,13 +59,13 @@ public class DisguiseUtilities {
|
||||
* @param Resends
|
||||
* the entity to all the watching players, which is where the magic begins
|
||||
*/
|
||||
public static void refreshTrackers(Entity entity) {
|
||||
public static void refreshTrackers(TargetedDisguise disguise) {
|
||||
try {
|
||||
Object world = ReflectionManager.getWorld(entity.getWorld());
|
||||
Object world = ReflectionManager.getWorld(disguise.getEntity().getWorld());
|
||||
Object tracker = world.getClass().getField("tracker").get(world);
|
||||
Object trackedEntities = tracker.getClass().getField("trackedEntities").get(tracker);
|
||||
Object entityTrackerEntry = trackedEntities.getClass().getMethod("get", int.class)
|
||||
.invoke(trackedEntities, entity.getEntityId());
|
||||
.invoke(trackedEntities, disguise.getEntity().getEntityId());
|
||||
if (entityTrackerEntry != null) {
|
||||
HashSet trackedPlayers = (HashSet) entityTrackerEntry.getClass().getField("trackedPlayers")
|
||||
.get(entityTrackerEntry);
|
||||
@@ -72,11 +73,15 @@ public class DisguiseUtilities {
|
||||
Method updatePlayer = entityTrackerEntry.getClass().getMethod("updatePlayer",
|
||||
ReflectionManager.getNmsClass("EntityPlayer"));
|
||||
HashSet cloned = (HashSet) trackedPlayers.clone();
|
||||
for (Object player : cloned) {
|
||||
if (entity instanceof Player && !((Player) ReflectionManager.getBukkitEntity(player)).canSee((Player) entity))
|
||||
continue;
|
||||
clear.invoke(entityTrackerEntry, player);
|
||||
updatePlayer.invoke(entityTrackerEntry, player);
|
||||
for (Object p : cloned) {
|
||||
Player player = (Player) ReflectionManager.getBukkitEntity(p);
|
||||
// if (entity instanceof Player && !((Player) ReflectionManager.getBukkitEntity(player)).canSee((Player)
|
||||
// entity))
|
||||
// continue;
|
||||
if (disguise.canSee(player.getName())) {
|
||||
clear.invoke(entityTrackerEntry, p);
|
||||
updatePlayer.invoke(entityTrackerEntry, p);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
@@ -232,14 +237,89 @@ public class DisguiseUtilities {
|
||||
}
|
||||
}
|
||||
|
||||
public static void addDisguise(int entityId, TargettedDisguise disguise) {
|
||||
public static void addDisguise(int entityId, TargetedDisguise disguise) {
|
||||
// TODO Make sure that the disguised entity doesn't have the player looking at other girls
|
||||
// ^ Done?
|
||||
if (!getDisguises().containsKey(entityId)) {
|
||||
getDisguises().put(entityId, new HashSet<TargettedDisguise>());
|
||||
getDisguises().put(entityId, new HashSet<TargetedDisguise>());
|
||||
}
|
||||
getDisguises().get(entityId).add(disguise);
|
||||
checkConflicts(disguise, null);
|
||||
}
|
||||
|
||||
public static boolean removeDisguise(TargettedDisguise disguise) {
|
||||
/**
|
||||
* If name isn't null. Make sure that the name doesn't see any other disguise. Else if name is null. Make sure that the
|
||||
* observers in the disguise don't see any other disguise.
|
||||
*/
|
||||
public static void checkConflicts(TargetedDisguise disguise, String name) {
|
||||
if (DisguiseAPI.isDisguiseInUse(disguise)) {
|
||||
Iterator<TargetedDisguise> disguiseItel = getDisguises().get(disguise.getEntity().getEntityId()).iterator();
|
||||
while (disguiseItel.hasNext()) {
|
||||
TargetedDisguise d = disguiseItel.next();
|
||||
if (d != disguise) {
|
||||
if (d.getTargetType() == TargetType.HIDE_DISGUISE_TO_EVERYONE_BUT_THESE_PLAYERS) {
|
||||
// If player is a observer in the loop
|
||||
if (disguise.getTargetType() == TargetType.HIDE_DISGUISE_TO_EVERYONE_BUT_THESE_PLAYERS) {
|
||||
// If player is a observer in the disguise
|
||||
// Remove them from the loop
|
||||
if (name != null) {
|
||||
d.unsetViewDisguise(name);
|
||||
} else {
|
||||
for (String playername : disguise.getObservers()) {
|
||||
d.unsetViewDisguise(playername);
|
||||
}
|
||||
}
|
||||
} else if (disguise.getTargetType() == TargetType.SHOW_TO_EVERYONE_BUT_THESE_PLAYERS) {
|
||||
// If player is not a observer in the loop
|
||||
if (name != null) {
|
||||
if (!disguise.getObservers().contains(name)) {
|
||||
d.unsetViewDisguise(name);
|
||||
}
|
||||
} else {
|
||||
for (String playername : d.getObservers()) {
|
||||
if (!disguise.getObservers().contains(playername)) {
|
||||
d.unsetViewDisguise(playername);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (d.getTargetType() == TargetType.SHOW_TO_EVERYONE_BUT_THESE_PLAYERS) {
|
||||
// Here you add it to the loop if they see the disguise
|
||||
if (disguise.getTargetType() == TargetType.HIDE_DISGUISE_TO_EVERYONE_BUT_THESE_PLAYERS) {
|
||||
// Everyone who is in the disguise needs to be added to the loop
|
||||
if (name != null) {
|
||||
d.setViewDisguise(name);
|
||||
} else {
|
||||
for (String playername : disguise.getObservers()) {
|
||||
d.setViewDisguise(playername);
|
||||
}
|
||||
}
|
||||
} else if (disguise.getTargetType() == TargetType.SHOW_TO_EVERYONE_BUT_THESE_PLAYERS) {
|
||||
// This here is a paradox.
|
||||
// If fed a name. I can do this.
|
||||
// But the rest of the time.. Its going to conflict.
|
||||
System.out.print("Cannot set more than one " + TargetType.SHOW_TO_EVERYONE_BUT_THESE_PLAYERS
|
||||
+ " on a entity. Removed the old disguise.");
|
||||
disguiseItel.remove();
|
||||
/* if (name != null) {
|
||||
if (!disguise.getObservers().contains(name)) {
|
||||
d.setViewDisguise(name);
|
||||
}
|
||||
} else {
|
||||
for (String playername : d.getObservers()) {
|
||||
if (!disguise.getObservers().contains(playername)) {
|
||||
d.setViewDisguise(playername);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean removeDisguise(TargetedDisguise disguise) {
|
||||
int entityId = disguise.getEntity().getEntityId();
|
||||
if (getDisguises().containsKey(entityId) && getDisguises().get(entityId).remove(disguise)) {
|
||||
if (getDisguises().get(entityId).isEmpty()) {
|
||||
@@ -251,11 +331,12 @@ public class DisguiseUtilities {
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public static TargettedDisguise getDisguise(int entityId) {
|
||||
TargettedDisguise toReturn = null;
|
||||
public static TargetedDisguise getDisguise(int entityId) {
|
||||
TargetedDisguise toReturn = null;
|
||||
if (getDisguises().containsKey(entityId)) {
|
||||
for (TargettedDisguise disguise : getDisguises().get(entityId)) {
|
||||
if (disguise.getTargetType() == TargetType.HIDE_FROM_THESE && disguise.getObservers().isEmpty()) {
|
||||
for (TargetedDisguise disguise : getDisguises().get(entityId)) {
|
||||
if (disguise.getTargetType() == TargetType.SHOW_TO_EVERYONE_BUT_THESE_PLAYERS
|
||||
&& disguise.getObservers().isEmpty()) {
|
||||
return disguise;
|
||||
}
|
||||
if (toReturn == null) {
|
||||
@@ -266,16 +347,16 @@ public class DisguiseUtilities {
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
public static TargettedDisguise[] getDisguises(int entityId) {
|
||||
public static TargetedDisguise[] getDisguises(int entityId) {
|
||||
if (getDisguises().containsKey(entityId)) {
|
||||
return getDisguises().get(entityId).toArray(new TargettedDisguise[getDisguises().get(entityId).size()]);
|
||||
return getDisguises().get(entityId).toArray(new TargetedDisguise[getDisguises().get(entityId).size()]);
|
||||
}
|
||||
return new TargettedDisguise[0];
|
||||
return new TargetedDisguise[0];
|
||||
}
|
||||
|
||||
public static TargettedDisguise getDisguise(Player observer, int entityId) {
|
||||
public static TargetedDisguise getDisguise(Player observer, int entityId) {
|
||||
if (getDisguises().containsKey(entityId)) {
|
||||
for (TargettedDisguise disguise : getDisguises().get(entityId)) {
|
||||
for (TargetedDisguise disguise : getDisguises().get(entityId)) {
|
||||
if (disguise.canSee(observer)) {
|
||||
return disguise;
|
||||
}
|
||||
@@ -291,7 +372,7 @@ public class DisguiseUtilities {
|
||||
Entity e = disguise.getEntity();
|
||||
// If the disguises entity is null, or the disguised entity isn't a player return
|
||||
if (e == null || !(e instanceof Player) || !getDisguises().containsKey(e.getEntityId())
|
||||
|| !getDisguises().get(e).contains(disguise))
|
||||
|| !getDisguises().get(e.getEntityId()).contains(disguise))
|
||||
return;
|
||||
Player player = (Player) e;
|
||||
// Remove the old disguise, else we have weird disguises around the place
|
||||
|
||||
Reference in New Issue
Block a user