Merge pull request #72 from Grzybol/release-4.5.0

Release 4.5.0
Grzybol · Jul 12, 2024 · 58c31e9 · 58c31e9
2 parents 260273b + 250d143
commit 58c31e9
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 57 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>betterbox.mine.game</groupId>
     <artifactId>BetterElo</artifactId>
-    <version>4.4.29-SNAPSHOT</version>
+    <version>4.4.52-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BetterElo</name>

diff --git a/src/main/java/betterbox/mine/game/betterelo/BetterElo.java b/src/main/java/betterbox/mine/game/betterelo/BetterElo.java
@@ -117,7 +117,7 @@ public void onEnable() {
         customMobsFileManager = new CustomMobsFileManager(folderPath,this, pluginLogger);
         pluginLogger.log(PluginLogger.LogLevel.DEBUG,"BetterElo: onEnable: calling customMobsFileManager.loadSpawners()");
         customMobsFileManager.loadSpawners();
-        customMobs = new CustomMobs(pluginLogger,this,customMobsFileManager, fileRewardManager);
+        customMobs = new CustomMobs(pluginLogger,this,customMobsFileManager, fileRewardManager,this );
         pluginLogger.log(PluginLogger.LogLevel.INFO,"Starting spawners scheduler...");
         customMobs.startSpawnerScheduler();
 
@@ -126,7 +126,7 @@ public void onEnable() {
         betterRanksCheaters = new BetterRanksCheaters(this,pluginLogger);
         CheaterCheckScheduler cheaterCheckScheduler = new CheaterCheckScheduler(this, betterRanksCheaters, getServer().getScheduler(), pluginLogger);
         // Rejestracja listenera eventów
-        event = new Event(dataManager, pluginLogger,this,betterRanksCheaters,configManager,this,customMobs,fileRewardManager,guiManager);
+        event = new Event(dataManager, pluginLogger,this,betterRanksCheaters,configManager,this,customMobs,fileRewardManager,guiManager,customMobsFileManager);
         getServer().getPluginManager().registerEvents(event, this);
         getCommand("be").setExecutor(new BetterEloCommand(this, dataManager, guiManager, pluginLogger, this, configManager,event,PKDB, customMobs, customMobsFileManager));
         pluginLogger.log(PluginLogger.LogLevel.DEBUG,"BetterElo: onEnable: Plugin BetterElo został włączony pomyślnie.");
@@ -610,6 +610,13 @@ public void killAllCustomMobs() {
         pluginLogger.log(PluginLogger.LogLevel.INFO, "BetterElo.killAllCustomMobs killed "+killedMobCount+" custom mobs.");
     }
     public void removeAndKillAllCustomMobs() {
+        for (CustomMobs.CustomMob customMob : customMobsMap.values()) {
+            // Sprawdzanie, czy encja jest nadal żywa przed próbą jej zabicia
+            if (customMob.entity != null && !customMob.entity.isDead()) {
+                customMob.entity.remove(); // Usuwa encję z świata
+
+            }
+        }
         for (CustomMobs.CustomMob customMob : customMobsMap.values()) {
             // Sprawdzanie, czy encja jest nadal żywa przed próbą jej zabicia
             if (customMob.entity != null && !customMob.entity.isDead()) {
@@ -645,6 +652,7 @@ public void run() {
                         customMobs.decreaseMobCount(entry.getValue().spawnerName);
                         iterator.remove();
                         String spawnerName = entry.getValue().spawnerName;
+                        customMobs.spawnedMobsMap.remove(entry.getKey().getUniqueId());
 
 
                         if(!entry.getKey().isValid()){
@@ -665,7 +673,7 @@ public void run() {
                     }
                 }
             }
-        }.runTaskTimer(this, 0L, 20L * 60); // Uruchom co 1 minutę (20 ticków = 1 sekunda)
+        }.runTaskTimer(this, 0L, 20L * 10); // Uruchom co 1 minutę (20 ticków = 1 sekunda)
     }
 
 }
diff --git a/src/main/java/betterbox/mine/game/betterelo/BetterEloCommand.java b/src/main/java/betterbox/mine/game/betterelo/BetterEloCommand.java
@@ -267,6 +267,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                 break;
             case 2:
                 switch (args[0].toLowerCase()) {
+                    case "forcespawn":
+                        if(sender.isOp()||sender.hasPermission("betterelo.forcespawn")){
+                            customMobs.spawnerForceSpawn(args[1]);
+                        }
+                        break;
                     case "droptable":
                     if(sender.isOp()||sender.hasPermission("betterelo.droptable")){
                         handleCreateDropTable(sender,args[1]);