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

No longer using concurrenthashmap

Browse Source
This commit is contained in:
Andrew
2013-06-01 18:35:31 +12:00
parent 20a75f947a
commit 7324926062
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
package me.libraryaddict.disguise;
import java.util.concurrent.ConcurrentHashMap;
import java.util.HashMap;
import me.libraryaddict.disguise.DisguiseTypes.Disguise;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound;
import me.libraryaddict.disguise.DisguiseTypes.DisguiseSound.SoundType;
@@ -32,11 +31,22 @@ import com.comphenix.protocol.reflect.StructureModifier;
public class DisguiseAPI {
private static ConcurrentHashMap<Object, Disguise> disguises = new ConcurrentHashMap<Object, Disguise>();
private static HashMap<Object, Disguise> disguises = new HashMap<Object, Disguise>();
private static PacketListener packetListener;
private static JavaPlugin plugin;
private static boolean soundsEnabled;
private synchronized static void put(Object obj, Disguise disguise) {
if (disguise == null)
disguises.remove(obj);
else
disguises.put(obj, disguise);
}
private synchronized static Disguise get(Object obj) {
return disguises.get(obj);
}
/**
* @param Player
* - The player to disguise
@@ -44,7 +54,9 @@ public class DisguiseAPI {
* - The disguise to wear
*/
public static void disguiseToAll(Entity entity, Disguise disguise) {
disguises.put(entity instanceof Player ? ((Player) entity).getName() : entity.getUniqueId(), disguise);
if (disguise == null)
return;
put(entity instanceof Player ? ((Player) entity).getName() : entity.getUniqueId(), disguise);
disguise.constructWatcher(entity.getType(), entity.getEntityId());
refresh(entity);
}
@@ -67,11 +79,11 @@ public class DisguiseAPI {
public static Disguise getDisguise(Object disguiser) {
if (disguiser instanceof Entity) {
if (disguiser instanceof Player)
return disguises.get(((Player) disguiser).getName());
return get(((Player) disguiser).getName());
else
return disguises.get(((Entity) disguiser).getUniqueId());
return get(((Entity) disguiser).getUniqueId());
}
return disguises.get(disguiser);
return get(disguiser);
}
protected static void init(JavaPlugin mainPlugin) {
@@ -158,11 +170,11 @@ public class DisguiseAPI {
public static boolean isDisguised(Object disguiser) {
if (disguiser instanceof Entity) {
if (disguiser instanceof Player)
return disguises.containsKey(((Player) disguiser).getName());
return get(((Player) disguiser).getName()) != null;
else
return disguises.containsKey(((Entity) disguiser).getUniqueId());
return get(((Entity) disguiser).getUniqueId()) != null;
}
return disguises.containsKey(disguiser);
return get(disguiser) != null;
}
/**
@@ -188,7 +200,7 @@ public class DisguiseAPI {
* - Undisguises him
*/
public static void undisguiseToAll(Entity entity) {
disguises.remove(entity instanceof Player ? ((Player) entity).getName() : entity.getUniqueId());
put(entity instanceof Player ? ((Player) entity).getName() : entity.getUniqueId(), null);
refresh(entity);
}
}

1
src/me/libraryaddict/disguise/LibsDisguises.java
View File

@@ -155,6 +155,7 @@ public class LibsDisguises extends JavaPlugin implements Listener {
}
}
});
Bukkit.getPluginManager().registerEvents(this, this);
}
@EventHandler