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

Minor code clean

Browse Source
This commit is contained in:
libraryaddict
2013-11-19 08:39:28 +13:00
parent 33460a6fb7
commit 4e101c3ec6
4 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ public class LibsDisguises extends JavaPlugin {
break;
}
try {
Object entity = ReflectionManager.getEntityInstance(name);
Object entity = ReflectionManager.createEntityInstance(name);
Entity bukkitEntity = (Entity) ReflectionManager.getNmsClass("Entity").getMethod("getBukkitEntity")
.invoke(entity);
int size = 0;

2
src/me/libraryaddict/disguise/PacketsManager.java
View File

@@ -612,7 +612,7 @@ public class PacketsManager {
Packets.Server.REL_ENTITY_MOVE_LOOK, Packets.Server.ENTITY_LOOK, Packets.Server.ENTITY_TELEPORT,
Packets.Server.ENTITY_HEAD_ROTATION, Packets.Server.ENTITY_METADATA, Packets.Server.ENTITY_EQUIPMENT,
Packets.Server.ARM_ANIMATION, Packets.Server.ENTITY_LOCATION_ACTION, Packets.Server.MOB_EFFECT,
/* Packets.Server.ENTITY_STATUS, */Packets.Server.ENTITY_VELOCITY, Packets.Server.UPDATE_ATTRIBUTES) {
Packets.Server.ENTITY_VELOCITY, Packets.Server.UPDATE_ATTRIBUTES) {
@Override
public void onPacketSending(PacketEvent event) {
StructureModifier<Entity> entityModifer = event.getPacket().getEntityModifier(event.getPlayer().getWorld());

11
src/me/libraryaddict/disguise/ReflectionManager.java
View File

@@ -20,7 +20,7 @@ public class ReflectionManager {
try {
if (method.getReturnType() == float.class && Modifier.isProtected(method.getModifiers())
&& method.getParameterTypes().length == 0) {
Object entity = getEntityInstance("Pig");
Object entity = createEntityInstance("Pig");
method.setAccessible(true);
method.invoke(entity);
Field random = getNmsClass("Entity").getDeclaredField("random");
@@ -79,11 +79,11 @@ public class ReflectionManager {
return null;
}
public static Object getEntityInstance(String entityName) {
public static Object createEntityInstance(String entityName) {
try {
Class entityClass = getNmsClass("Entity" + entityName);
Object entityObject;
Object world = getWorld();
Object world = getWorld(Bukkit.getWorlds().get(0));
if (entityName.equals("Player")) {
Object minecraftServer = getNmsClass("MinecraftServer").getMethod("getServer").invoke(null);
Object playerinteractmanager = getNmsClass("PlayerInteractManager").getConstructor(getNmsClass("World"))
@@ -121,7 +121,6 @@ public class ReflectionManager {
public static Float getSoundModifier(Object entity) {
try {
// TODO Update this each update!
soundMethod.setAccessible(true);
return (Float) soundMethod.invoke(entity);
} catch (Exception ex) {
@@ -129,10 +128,6 @@ public class ReflectionManager {
return null;
}
private static Object getWorld() {
return getWorld(Bukkit.getWorlds().get(0));
}
public static Object getWorld(World world) {
try {
return getCraftClass("CraftWorld").getMethod("getHandle").invoke(world);

14
src/me/libraryaddict/disguise/disguisetypes/Values.java
View File

@@ -6,10 +6,6 @@ public class Values {
private static HashMap<DisguiseType, Values> values = new HashMap<DisguiseType, Values>();
/* public static HashMap<String, Double> getAttributesValues(DisguiseType type) {
return getValues(type).getAttributesValues();
}*/
public static Class getEntityClass(DisguiseType type) {
return getValues(type).getEntityClass();
}
@@ -45,8 +41,6 @@ public class Values {
return values.get(type);
}
// private HashMap<String, Double> attributesValues = new HashMap<String, Double>();
private Class declared;
private int enumEntitySize;
@@ -58,10 +52,6 @@ public class Values {
declared = classType;
}
/*public HashMap<String, Double> getAttributesValues() {
return attributesValues;
}*/
public Class getEntityClass() {
return declared;
}
@@ -113,10 +103,6 @@ public class Values {
return metaValues;
}
/*public void setAttributesValue(String attribute, Double value) {
attributesValues.put(attribute, value);
}*/
public void setMetaValue(int no, Object value) {
metaValues.put(no, value);
}