Fix merge artifacts

GreenSurvivors · Feb 8, 2024 · 5797d1c · 5797d1c
1 parent 5847728
commit 5797d1c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 176 deletions.
diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/RegionEvents.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/RegionEvents.java
@@ -220,7 +220,7 @@ private void playersEndPhase(EndPhaseMinigameEvent event) {
         }
 
         for (Node node : RegionModule.getMinigameModule(event.getMinigame()).getNodes()) {
-            node.execute(Triggers.getTrigger("GAME_ENDPHASE"), null);
+            node.execute(MgRegTrigger.GAME_ENDPHASE, null);
         }
     }
 

diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/language/RegionLangKey.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/language/RegionLangKey.java
@@ -119,7 +119,7 @@ public enum RegionLangKey implements LangKey {
     TOOL_REGION_DESELECTED("tool.region.deselected"),
     TOOL_REGION_EDIT("tool.region.edit"),
     TOOL_REGION_SELECTED("tool.region.selected"),
-    TRIGGER_GAME_END_NAME("trigger.gameEnd.name"),
+    TRIGGER_GAME_ENDPHASE_NAME("trigger.gameEndPhase.name"),
     TRIGGER_GAME_JOIN_NAME("trigger.player.gameJoin.name"),
     TRIGGER_GAME_QUIT_NAME("trigger.player.gameQuit.name"),
     TRIGGER_GAME_START_NAME("trigger.gameStart.name"),
@@ -153,7 +153,8 @@ public enum RegionLangKey implements LangKey {
     TRIGGER_TIME_TIMER_NAME("trigger.time.timer.name"),
     MENU_RNDCHANCE_SETPERCENT_NAME("menu.condition.randomChance.percentage"),
     MENU_HEALTH_MINIMUM_NAME("menu.health.minimum.name"),
-    MENU_HEALTH_MAXIMUM_NAME("menu.health.maximum.name");
+    MENU_HEALTH_MAXIMUM_NAME("menu.health.maximum.name"),
+    TRIGGER_GAME_ENDED_NAME("trigger.game.ended.name");
 
     private final @NotNull String path;
 

diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/GameEndPhaseTrigger.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/GameEndPhaseTrigger.java
diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/GameEndedTrigger.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/GameEndedTrigger.java
diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/MgRegTrigger.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/MgRegTrigger.java
@@ -7,7 +7,8 @@
 import org.jetbrains.annotations.Nullable;
 
 public enum MgRegTrigger implements Trigger {
-    GAME_END(false, true, true, RegionLangKey.TRIGGER_GAME_END_NAME),
+    GAME_ENDPHASE(false, true, true, RegionLangKey.TRIGGER_GAME_ENDPHASE_NAME, "GAME_END"),
+    GAME_ENDED(false, true, true, RegionLangKey.TRIGGER_GAME_ENDED_NAME),
     GAME_START(false, true, true, RegionLangKey.TRIGGER_GAME_START_NAME),
     PLAYER_BLOCK_BREAK(true, true, true, RegionLangKey.TRIGGER_PLAYER_BLOCK_BREAK_NAME, "BLOCK_BREAK"),
     PLAYER_BLOCK_CLICK_LEFT(false, true, true, RegionLangKey.TRIGGER_PLAYER_BLOCK_CLICK_LEFT_NAME, "LEFT_CLICK_BLOCK"),
@@ -34,7 +35,7 @@ public enum MgRegTrigger implements Trigger {
     PLAYER_XP_CHANGE(true, true, true, RegionLangKey.TRIGGER_PLAYER_XP_CHANGE_NAME, "XP_CHANGE"),
     RANDOM(true, true, true, RegionLangKey.TRIGGER_RANDOM_NAME),
     REMOTE(true, true, true, RegionLangKey.TRIGGER_REMOTE_NAME),
-    REMOTE_TIMED(true, true, false, RegionLangKey.TRIGGER_REMOTE_TIMED_NAME, "TIMED_REMOTE"),
+    REMOTE_TIMED(true, true, true, RegionLangKey.TRIGGER_REMOTE_TIMED_NAME, "TIMED_REMOTE"),
     TIME_GAMETICK(true, false, false, RegionLangKey.TRIGGER_TIME_GAMETICK_NAME, "GAME_TICK"), // todo is it the same as tick?
     TIME_MINIGAMETIMER(false, true, true, RegionLangKey.TRIGGER_TIME_TIMER_NAME, "MINIGAME_TIMER"),
     TIME_TICK(true, false, true, RegionLangKey.TRIGGER_TIME_TICK_NAME, "TICK"); // todo is it the same as gametick?

diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/TimedRemoteTrigger.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/TimedRemoteTrigger.java
diff --git a/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/Triggers.java b/Regions/src/main/java/au/com/mineauz/minigamesregions/triggers/Triggers.java
diff --git a/Regions/src/main/resources/minigames_regions.properties b/Regions/src/main/resources/minigames_regions.properties
@@ -117,7 +117,8 @@ tool.nodeRegion.selected=Multiple regions/nodes selected: <text>
 tool.region.deselected=Deselected the region.
 tool.region.edit=Editing region <region>
 tool.region.selected=Selected the " <region>" region in <minigame>
-trigger.gameEnd.name=Game is about to end
+trigger.gameEndPhase.name=Game may about to end
+trigger.game.ended.name=Game has definitely ended
 trigger.gameStart.name=Game start
 trigger.item.drop.name=Player drop item
 trigger.player.CTFFlag.drop.name=Player drops CTF flag
-Original file line number
+Diff line change
@@ Expand Up / @@ -220,7 +220,7 @@ private void playersEndPhase(EndPhaseMinigameEvent event) { @@
             }
             for (Node node : RegionModule.getMinigameModule(event.getMinigame()).getNodes()) {
-                node.execute(Triggers.getTrigger("GAME_ENDPHASE"), null);
+                node.execute(MgRegTrigger.GAME_ENDPHASE, null);
             }
         }
@@ Expand Down @@