diff --git a/pom.xml b/pom.xml index 7df3611..49fb55a 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ pw.yumc YumCore jar - 1.8 + 1.7 io.github.Cnly.WowSuchCleaner diff --git a/src/main/java/org/maxgamer/QuickShop/Shop/Item/DisplayItem.java b/src/main/java/org/maxgamer/QuickShop/Shop/Item/DisplayItem.java index eeb8ed9..7de0621 100644 --- a/src/main/java/org/maxgamer/QuickShop/Shop/Item/DisplayItem.java +++ b/src/main/java/org/maxgamer/QuickShop/Shop/Item/DisplayItem.java @@ -31,15 +31,16 @@ public abstract class DisplayItem { List> fakeItems = Arrays.asList(FakeItem_19_111.class, FakeItem_18.class, FakeItem_17.class); Log.i("启用虚拟悬浮物 尝试启动中..."); FakeItem.register(plugin); - fakeItems.forEach(c -> { + for (Class c : fakeItems) { try { c.getConstructor(Location.class, ItemStack.class).newInstance(new Location(Bukkit.getWorlds().get(0), 0, 0, 0), new ItemStack(Material.STONE)).spawn(); displayItemClass = c; Log.i("虚拟悬浮物功能测试正常(%s)...", c.getSimpleName()); + break; } catch (Throwable e) { Log.d(e); } - }); + } if (displayItemClass == null) { displayItemClass = NormalItem.class; Log.w("+========================================="); diff --git a/src/main/java/org/maxgamer/QuickShop/Shop/Item/FakeItem_18.java b/src/main/java/org/maxgamer/QuickShop/Shop/Item/FakeItem_18.java index c624b26..690dfcc 100644 --- a/src/main/java/org/maxgamer/QuickShop/Shop/Item/FakeItem_18.java +++ b/src/main/java/org/maxgamer/QuickShop/Shop/Item/FakeItem_18.java @@ -30,7 +30,7 @@ public class FakeItem_18 extends FakeItem { @Override protected PacketContainer setMetadataPacket(PacketContainer fakePacket) { fakePacket.getIntegers().write(0, eid); - final WrappedWatchableObject itemMeta = new WrappedWatchableObject(10, itemStack); + final WrappedWatchableObject itemMeta = new WrappedWatchableObject(5, itemStack); final List entityMetaList = new ArrayList<>(1); entityMetaList.add(itemMeta); fakePacket.getWatchableCollectionModifier().write(0, entityMetaList); diff --git a/src/main/java/org/maxgamer/QuickShop/Shop/Item/FakeItem_19_111.java b/src/main/java/org/maxgamer/QuickShop/Shop/Item/FakeItem_19_111.java index 23d6703..41457b9 100644 --- a/src/main/java/org/maxgamer/QuickShop/Shop/Item/FakeItem_19_111.java +++ b/src/main/java/org/maxgamer/QuickShop/Shop/Item/FakeItem_19_111.java @@ -1,5 +1,7 @@ package org.maxgamer.QuickShop.Shop.Item; +import java.util.Optional; + import org.bukkit.Location; import org.bukkit.inventory.ItemStack; @@ -8,7 +10,6 @@ import com.comphenix.protocol.reflect.StructureModifier; import com.comphenix.protocol.wrappers.WrappedDataWatcher; import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer; import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject; -import com.google.common.base.Optional; /** * Minecraft 虚拟悬浮物品工具类 @@ -28,7 +29,7 @@ public class FakeItem_19_111 extends FakeItem { fakePacket.getIntegers().write(0, eid); final WrappedDataWatcher wr = new WrappedDataWatcher(); final Serializer serializer = WrappedDataWatcher.Registry.getItemStackSerializer(true); - final WrappedDataWatcherObject object = new WrappedDataWatcher.WrappedDataWatcherObject(6, serializer); + final WrappedDataWatcherObject object = new WrappedDataWatcherObject(6, serializer); wr.setObject(object, Optional.of(itemStack)); fakePacket.getWatchableCollectionModifier().write(0, wr.getWatchableObjects()); return fakePacket;