* Added minecart to the entities Limit

(Limit for minecarts it is the total entites-pet-chunk limit)
PonnyTheLight · Feb 19, 2023 · 9a03737 · 9a03737
1 parent 51c6b9a
commit 9a03737
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>es.ponnythelight</groupId>
     <artifactId>ChunkEntityLimiter</artifactId>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ChunkEntityLimiter</name>

diff --git a/src/main/java/es/ponnythelight/listeners/checkListener.java b/src/main/java/es/ponnythelight/listeners/checkListener.java
@@ -9,11 +9,13 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.vehicle.VehicleCreateEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 
 import java.util.Arrays;
@@ -140,19 +142,6 @@ public void playerDropItem(PlayerDropItemEvent e) {
 
         AtomicInteger counti = new AtomicInteger();
 
-//        en.stream().forEach(k -> {
-//
-//            if (k.getType().equals(EntityType.DROPPED_ITEM)) {
-//                counti.getAndIncrement();
-//
-//                if (counti.get() >= config.getInt("Config.dropped-items-per-chunk")) {
-//                    System.out.println("Spawn");
-//                    e.setCancelled(true);
-//                    return player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getString("Messages.prefix") + config.getString("Messages.max-dropped-items")));
-//                }
-//
-//            }
-//        });
 
         for (Entity i : en) {
             if (i.getType().equals(EntityType.DROPPED_ITEM)) {
@@ -168,5 +157,56 @@ public void playerDropItem(PlayerDropItemEvent e) {
         }
     }
 
+    @EventHandler
+    public void PlayerInteract(VehicleCreateEvent e) {
+        Configuration config = plugin.getConfig();
+        Vehicle v = e.getVehicle();
+
+        Chunk chunk = v.getLocation().getChunk();
+
+        List<Entity> en = Arrays.asList(chunk.getEntities());
+        AtomicInteger countp = new AtomicInteger();
+
+        en.forEach(k -> {
+            if (k.getType().equals(EntityType.MINECART)) {
+                countp.getAndIncrement();
+
+                if (countp.get() >= config.getInt("Config.entities-per-chunk")) {
+                    e.setCancelled(true);
+                }
+            } else if (k.getType().equals(EntityType.MINECART_CHEST)) {
+                countp.getAndIncrement();
+
+                if (countp.get() >= config.getInt("Config.entities-per-chunk")) {
+                    e.setCancelled(true);
+                }
+            } else if (k.getType().equals(EntityType.MINECART_FURNACE)) {
+                countp.getAndIncrement();
+
+                if (countp.get() >= config.getInt("Config.entities-per-chunk")) {
+                    e.setCancelled(true);
+                }
+            } else if (k.getType().equals(EntityType.MINECART_HOPPER)) {
+                countp.getAndIncrement();
+
+                if (countp.get() >= config.getInt("Config.entities-per-chunk")) {
+                    e.setCancelled(true);
+                }
+            } else if (k.getType().equals(EntityType.MINECART_TNT)) {
+                countp.getAndIncrement();
+
+                if (countp.get() >= config.getInt("Config.entities-per-chunk")) {
+                    e.setCancelled(true);
+                }
+            } else if (k.getType().equals(EntityType.MINECART_MOB_SPAWNER)) {
+                countp.getAndIncrement();
+
+                if (countp.get() >= config.getInt("Config.entities-per-chunk")) {
+                    e.setCancelled(true);
+                }
+            }
+        });
+    }
+
 
 }