Fix issue with events

Author: Devlrxxh

Plugin/src/main/java/dev/lrxh/neptune/feature/event/command/EventCommand.java

@@ -32,20 +32,6 @@ public void stop(@Sender Player player) {
         EventService.get().stopEvent();
     }
 
-    @Command(name = "forcestart", desc = "Force start the event immediately")
-    public void forceStart(@Sender Player player) {
-        var event = EventService.get().getActiveEvent();
-        if (event == null || event.getState() != dev.lrxh.neptune.feature.event.EventState.WAITING) {
-            MessagesLocale.EVENT_NOT_ACTIVE.send(player.getUniqueId());
-            return;
-        }
-        if (!player.getUniqueId().equals(event.getStarterUUID()) && !player.hasPermission("neptune.event.start")) {
-            MessagesLocale.NO_PERMISSION.send(player.getUniqueId());
-            return;
-        }
-        EventService.get().forceStart();
-    }
-
     @Command(name = "info", desc = "Show active event info")
     public void info(@Sender Player player) {
         var event = EventService.get().getActiveEvent();

Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java

@@ -15,6 +15,8 @@
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
 import dev.lrxh.neptune.configs.impl.SettingsLocale;
 import dev.lrxh.neptune.configs.impl.SoundsLocale;
+import dev.lrxh.neptune.feature.event.EventService;
+import dev.lrxh.neptune.feature.event.EventState;
 import dev.lrxh.neptune.feature.hotbar.HotbarService;
 import dev.lrxh.neptune.feature.leaderboard.LeaderboardService;
 import dev.lrxh.neptune.feature.leaderboard.impl.LeaderboardPlayerEntry;
@@ -100,7 +102,13 @@ public void end(Participant loser) {
                 Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
             }
 
-            forEachPlayer(player -> HotbarService.get().giveItems(player));
+            forEachPlayer(player -> {
+                var activeEvent = EventService.get().getActiveEvent();
+                if (activeEvent == null || activeEvent.getState() != EventState.ACTIVE
+                        || !activeEvent.getParticipants().contains(player.getUniqueId())) {
+                    HotbarService.get().giveItems(player);
+                }
+            });
         }
 
         removePlaying();
@@ -193,7 +201,10 @@ public void sendEndMessage() {
         }
 
         forEachParticipant(participant -> {
-            if (MessagesLocale.MATCH_PLAY_AGAIN_ENABLED.getBoolean()) {
+            var activeEvent = EventService.get().getActiveEvent();
+            boolean inEvent = activeEvent != null && activeEvent.getState() == EventState.ACTIVE
+                    && activeEvent.getParticipants().contains(participant.getPlayerUUID());
+            if (!inEvent && MessagesLocale.MATCH_PLAY_AGAIN_ENABLED.getBoolean()) {
                 PlayerUtil.sendMessage(participant.getPlayerUUID(), MessagesLocale.MATCH_PLAY_AGAIN.getString(), TagResolver.resolver(
                         Placeholder.parsed("kit", getKit().getDisplayName()),
                         Placeholder.unparsed("kit-name", getKit().getName()),