amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-22 10:22:29 +00:00
Code Issues Projects Releases Wiki Activity

Armor Stands should be removed from entity lists

Browse Source
This commit is contained in:
Eric 2017-06-15 13:30:21 +02:00
parent a78195037b
commit d135a7ae92
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/de/epiceric/shopchest/nms/ArmorStandWrapper.java
View File

@ -24,6 +24,8 @@ public class ArmorStandWrapper {
private ShopChest plugin; private ShopChest plugin;
private Object nmsWorld;
private Object entity; private Object entity;
private Location location; private Location location;
private String customName; private String customName;
@ -37,10 +39,10 @@ public class ArmorStandWrapper {
try { try {
Object craftWorld = location.getWorld().getClass().cast(location.getWorld()); Object craftWorld = location.getWorld().getClass().cast(location.getWorld());
Object worldServer = craftWorld.getClass().getMethod("getHandle").invoke(craftWorld); nmsWorld = craftWorld.getClass().getMethod("getHandle").invoke(craftWorld);
entity = entityArmorStandClass.getConstructor(worldClass, double.class, double.class,double.class) entity = entityArmorStandClass.getConstructor(worldClass, double.class, double.class,double.class)
.newInstance(worldServer, location.getX(), location.getY(), location.getZ()); .newInstance(nmsWorld, location.getX(), location.getY(), location.getZ());
if (customName != null && !customName.trim().isEmpty()) { if (customName != null && !customName.trim().isEmpty()) {
entityArmorStandClass.getMethod("setCustomName", String.class).invoke(entity, customName); entityArmorStandClass.getMethod("setCustomName", String.class).invoke(entity, customName);
@ -58,7 +60,7 @@ public class ArmorStandWrapper {
// Adds the entity to some lists so it can call interact events // Adds the entity to some lists so it can call interact events
Method addEntityMethod = worldServerClass.getDeclaredMethod((Utils.getMajorVersion() == 8 ? "a" : "b"), entityClass); Method addEntityMethod = worldServerClass.getDeclaredMethod((Utils.getMajorVersion() == 8 ? "a" : "b"), entityClass);
addEntityMethod.setAccessible(true); addEntityMethod.setAccessible(true);
addEntityMethod.invoke(worldServerClass.cast(worldServer), entity); addEntityMethod.invoke(worldServerClass.cast(nmsWorld), entity);
uuid = (UUID) entityClass.getMethod("getUniqueID").invoke(entity); uuid = (UUID) entityClass.getMethod("getUniqueID").invoke(entity);
entityId = (int) entityArmorStandClass.getMethod("getId").invoke(entity); entityId = (int) entityArmorStandClass.getMethod("getId").invoke(entity);
@ -139,6 +141,17 @@ public class ArmorStandWrapper {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
setVisible(player, false); setVisible(player, false);
} }
try {
// Removes the entity from the lists it was added to for interaction
Method addEntityMethod = worldServerClass.getDeclaredMethod((Utils.getMajorVersion() == 8 ? "b" : "c"), entityClass);
addEntityMethod.setAccessible(true);
addEntityMethod.invoke(worldServerClass.cast(nmsWorld), entity);
} catch (ReflectiveOperationException e) {
plugin.getLogger().severe("Could not remove hologram");
plugin.debug("Could not remove armor stand from entity lists");
plugin.debug(e);
}
} }
public int getEntityId() { public int getEntityId() {