Merge pull request #3 from MrEAlderson/master

Misc changes
MetallicGoat · Aug 31, 2024 · 20f693b · 20f693b
2 parents 280af11 + 2c6afed
commit 20f693b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/main/java/me/metallicgoat/gensplitter/GenSplitterPlugin.java b/src/main/java/me/metallicgoat/gensplitter/GenSplitterPlugin.java
@@ -13,8 +13,8 @@
 
 public class GenSplitterPlugin extends JavaPlugin {
 
-  private static final byte MBEDWARS_API_NUM = 100;
-  private static final String MBEDWARS_API_NAME = "5.4";
+  private static final byte MBEDWARS_API_NUM = 111;
+  private static final String MBEDWARS_API_NAME = "5.4.12";
   private static GenSplitterPlugin instance;
   private final Server server = getServer();
   private GenSplitterAddon addon;

diff --git a/src/main/java/me/metallicgoat/gensplitter/events/ItemSplit.java b/src/main/java/me/metallicgoat/gensplitter/events/ItemSplit.java
@@ -13,13 +13,12 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 
 public class ItemSplit implements Listener {
 
   private static final Sound PICKUP_SOUND = Helper.get().getSoundByName("ENTITY_ITEM_PICKUP");
 
-  @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+  @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
   public void onPlayerPickupDropEvent(PlayerPickupDropEvent event) {
     if (!event.isFromSpawner() || !ConfigValue.splitterEnabled || event instanceof PlayerPickupDropEventWrapper)
       return;
@@ -31,15 +30,6 @@ public void onPlayerPickupDropEvent(PlayerPickupDropEvent event) {
 
     final Player player = event.getPlayer();
     final Arena arena = event.getArena();
-    final ItemStack clonedStacked = new ItemStack(pickedUpStack.getType());
-    final ItemMeta im = pickedUpStack.getItemMeta();
-
-    if (im == null)
-      return;
-
-    im.setLore(null);
-    clonedStacked.setAmount(pickedUpStack.getAmount());
-    clonedStacked.setItemMeta(im);
 
     // give item to all players
     final Location collectLocation = player.getLocation();
@@ -62,7 +52,7 @@ public void onPlayerPickupDropEvent(PlayerPickupDropEvent event) {
         continue;
 
       // all good, lets give it him
-      split.getInventory().addItem(clonedStacked);
+      split.getInventory().addItem(pickedUpStack);
 
       if (PICKUP_SOUND != null)
         collectLocation.getWorld().playSound(collectLocation, PICKUP_SOUND, 1, 1);