Use NMS and Don't call event when player is afk to save resources (#584)

andrei1058 · Aug 18, 2022 · 48e4843 · 48e4843
1 parent 61bb88a
commit 48e4843
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/...onsupport_common/src/main/java/com/andrei1058/bedwars/listeners/ItemDropPickListener.java b/...onsupport_common/src/main/java/com/andrei1058/bedwars/listeners/ItemDropPickListener.java
@@ -136,12 +136,14 @@ private static boolean managePickup(Item item, LivingEntity player) {
                     ItemMeta itemMeta = new ItemStack(material).getItemMeta();
 
                     //Call ore pick up event
-                    PlayerGeneratorCollectEvent event = new PlayerGeneratorCollectEvent((Player) player, item, a);
-                    Bukkit.getPluginManager().callEvent(event);
-                    if (event.isCancelled()) {
-                        return true;
-                    } else {
-                        item.getItemStack().setItemMeta(itemMeta);
+                    if (!api.getAFKUtil().isPlayerAFK(((Player) player).getPlayer())){
+                        PlayerGeneratorCollectEvent event = new PlayerGeneratorCollectEvent((Player) player, item, a);
+                        Bukkit.getPluginManager().callEvent(event);
+                        if (event.isCancelled()) {
+                            return true;
+                        } else {
+                            item.getItemStack().setItemMeta(itemMeta);
+                        }
                     }
                 }
             }

diff --git a/...pport_common/src/main/java/com/andrei1058/bedwars/listeners/PlayerDropPick_1_11Minus.java b/...pport_common/src/main/java/com/andrei1058/bedwars/listeners/PlayerDropPick_1_11Minus.java
@@ -25,6 +25,7 @@
 import com.andrei1058.bedwars.api.arena.IArena;
 import com.andrei1058.bedwars.api.events.player.PlayerGeneratorCollectEvent;
 import com.andrei1058.bedwars.api.server.ServerType;
+import com.andrei1058.bedwars.support.version.common.VersionCommon;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
@@ -79,7 +80,7 @@ public void onPickup(PlayerPickupItemEvent e) {
             return;
         }
 
-        if (e.getItem().getItemStack().getType().toString().equals("BED")) {
+        if (VersionCommon.api.getVersionSupport().isBed(e.getItem().getItemStack().getType())) {
             e.setCancelled(true);
             e.getItem().remove();
         } else if (e.getItem().getItemStack().hasItemMeta()) {
@@ -90,12 +91,15 @@ public void onPickup(PlayerPickupItemEvent e) {
                     ItemMeta itemMeta = new ItemStack(material).getItemMeta();
 
                     //Call ore pick up event
-                    PlayerGeneratorCollectEvent event = new PlayerGeneratorCollectEvent(e.getPlayer(), e.getItem(), a);
-                    Bukkit.getPluginManager().callEvent(event);
-                    if (event.isCancelled()){
-                        e.setCancelled(true);
-                    } else {
-                        e.getItem().getItemStack().setItemMeta(itemMeta);
+
+                    if (!api.getAFKUtil().isPlayerAFK(e.getPlayer())){
+                        PlayerGeneratorCollectEvent event = new PlayerGeneratorCollectEvent(e.getPlayer(), e.getItem(), a);
+                        Bukkit.getPluginManager().callEvent(event);
+                        if (event.isCancelled()){
+                            e.setCancelled(true);
+                        } else {
+                            e.getItem().getItemStack().setItemMeta(itemMeta);
+                        }
                     }
                 }
             }
@@ -133,12 +137,4 @@ public void onDrop(PlayerDropItemEvent e) {
             e.setCancelled(true);
         }
     }
-
-    @EventHandler
-    //Prevent AFK players from picking items
-    public void onCollect(PlayerGeneratorCollectEvent e){
-        if (api.getAFKUtil().isPlayerAFK(e.getPlayer())){
-            e.setCancelled(true);
-        }
-    }
 }