Upstream
/
ShopChest
mirror of https://github.com/EpicEricEE/ShopChest.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

UUID of hologram and shop item should be unique

This commit is contained in:
Eric 2019-05-01 12:28:17 +02:00
parent 8f2d2540ba
commit e47fc9765d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,11 +16,12 @@ public class ArmorStandWrapper {
private final Class<?> packetPlayOutEntityTeleportClass = Utils.getNMSClass("PacketPlayOutEntityTeleport");
private final Class<?> dataWatcherClass = Utils.getNMSClass("DataWatcher");
private final UUID uuid = UUID.randomUUID();
private ShopChest plugin;
private Object entity;
private Location location;
private String customName;
private UUID uuid;
private int entityId = -1;
public ArmorStandWrapper(ShopChest plugin, Location location, String customName, boolean interactable) {
@ -34,7 +35,7 @@ public class ArmorStandWrapper {
if (visible) {
Object dataWatcher = Utils.createDataWatcher(customName, null);
entityId = Utils.getFreeEntityId();
Utils.sendPacket(plugin, Utils.createPacketSpawnEntity(plugin, entityId, UUID.randomUUID(), location, EntityType.ARMOR_STAND), player);
Utils.sendPacket(plugin, Utils.createPacketSpawnEntity(plugin, entityId, uuid, location, EntityType.ARMOR_STAND), player);
Utils.sendPacket(plugin, packetPlayOutEntityMetadataClass.getConstructor(int.class, dataWatcherClass, boolean.class)
.newInstance(entityId, dataWatcher, true), player);
} else if (entityId != -1) {

3
src/main/java/de/epiceric/shopchest/shop/ShopItem.java
View File

@ -21,6 +21,7 @@ public class ShopItem {
private final Set<UUID> viewers = Collections.newSetFromMap(new ConcurrentHashMap<UUID, Boolean>());
private final ItemStack itemStack;
private final Location location;
private final UUID uuid = UUID.randomUUID();
private int entityId = -1;
@ -91,7 +92,7 @@ public class ShopItem {
Object nmsItemStack = craftItemStackClass.getMethod("asNMSCopy", ItemStack.class).invoke(null, itemStack);
Object dataWatcher = Utils.createDataWatcher(null, nmsItemStack);
entityId = Utils.getFreeEntityId();
Utils.sendPacket(plugin, Utils.createPacketSpawnEntity(plugin, entityId, UUID.randomUUID(), location, EntityType.DROPPED_ITEM), p);
Utils.sendPacket(plugin, Utils.createPacketSpawnEntity(plugin, entityId, uuid, location, EntityType.DROPPED_ITEM), p);
Utils.sendPacket(plugin, packetPlayOutEntityMetadataClass.getConstructor(int.class, dataWatcherClass, boolean.class).newInstance(entityId, dataWatcher, true), p);
if (Utils.getMajorVersion() < 14) {
Utils.sendPacket(plugin, packetPlayOutEntityVelocityClass.getConstructor(int.class, double.class, double.class, double.class).newInstance(entityId, 0D, 0D, 0D), p);