patch 2.1.6

QoL Change, command/console-command runs after relogging in if the player spawns inside the region

Author: Invvk

WGEF-Abstraction/src/main/java/io/github/invvk/wgef/abstraction/flags/handler/command/CommandOnEntryHandler.java

@@ -31,9 +31,21 @@ protected CommandOnEntryHandler(Session session, Flag<Set<String>> flag) {
         super(session, flag);
     }
 
+    @Override
+    protected void onInitialValue(LocalPlayer player, ApplicableRegionSet set, Set<String> value) {
+        this.handleCommands(WGEFUtils.wrapPlayer(player), set);
+    }
+
     @Override
     protected boolean onSetValue(LocalPlayer localPlayer, Location from, Location to, ApplicableRegionSet toSet, Set<String> currentValue, Set<String> lastValue, MoveType moveType) {
-        Player player = WGEFUtils.wrapPlayer(localPlayer);
+        this.handleCommands(WGEFUtils.wrapPlayer(localPlayer), toSet);
+        return true;
+    }
+
+    @Override
+    protected boolean onAbsentValue(LocalPlayer player, Location from, Location to, ApplicableRegionSet toSet, Set<ProtectedRegion> exited, Set<String> lastValue, MoveType moveType) {return true;}
+
+    private void handleCommands(Player player, ApplicableRegionSet toSet) {
         Set<String> execute = new HashSet<>();
         for (ProtectedRegion region: toSet) {
             if (WGEFUtils.hasBypass(player, player.getWorld(), region, WGEFlags.COMMAND_ON_ENTRY))
@@ -43,11 +55,7 @@ protected boolean onSetValue(LocalPlayer localPlayer, Location from, Location to
                 execute.addAll(commands);
         }
         execute.forEach(e -> player.performCommand(e.substring(1).replace("%username%", player.getName())));
-        return true;
+
     }
 
-    @Override
-    protected boolean onAbsentValue(LocalPlayer player, Location from, Location to, ApplicableRegionSet toSet, Set<ProtectedRegion> exited, Set<String> lastValue, MoveType moveType) {return true;}
-    @Override
-    protected void onInitialValue(LocalPlayer player, ApplicableRegionSet set, Set<String> value) {}
 }

WGEF-Abstraction/src/main/java/io/github/invvk/wgef/abstraction/flags/handler/command/ConsoleCommandOnEntryHandler.java

@@ -31,9 +31,23 @@ protected ConsoleCommandOnEntryHandler(Session session) {
         super(session, WGEFlags.CONSOLE_COMMAND_ON_ENTRY);
     }
 
+    @Override
+    protected void onInitialValue(LocalPlayer player, ApplicableRegionSet set, Set<String> value) {
+        this.handleCommands(WGEFUtils.wrapPlayer(player), set);
+    }
+
     @Override
     protected boolean onSetValue(LocalPlayer localPlayer, Location from, Location to, ApplicableRegionSet toSet, Set<String> currentValue, Set<String> lastValue, MoveType moveType) {
-        Player player = WGEFUtils.wrapPlayer(localPlayer);
+        this.handleCommands(WGEFUtils.wrapPlayer(localPlayer), toSet);
+        return true;
+    }
+
+    @Override
+    protected boolean onAbsentValue(LocalPlayer player, Location from, Location to, ApplicableRegionSet toSet, Set<ProtectedRegion> exited, Set<String> lastValue, MoveType moveType) {
+        return true;
+    }
+
+    private void handleCommands(Player player, ApplicableRegionSet toSet) {
         Set<String> execute = new HashSet<>();
         for (ProtectedRegion region: toSet) {
             if (WGEFUtils.hasBypass(player, player.getWorld(), region, WGEFlags.CONSOLE_COMMAND_ON_ENTRY))
@@ -43,14 +57,6 @@ protected boolean onSetValue(LocalPlayer localPlayer, Location from, Location to
                 execute.addAll(commands);
         }
         execute.forEach(e -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), e.substring(1).replace("%username%", player.getName())));
-        return true;
     }
 
-    @Override
-    protected boolean onAbsentValue(LocalPlayer player, Location from, Location to, ApplicableRegionSet toSet, Set<ProtectedRegion> exited, Set<String> lastValue, MoveType moveType) {
-        return true;
-    }
-
-    @Override
-    protected void onInitialValue(LocalPlayer player, ApplicableRegionSet set, Set<String> value) {}
 }

build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'io.github.invvk'
-version '2.1.5'
+version '2.1.6'
 
 repositories {
     mavenCentral()