GH-8: explicitly give the MinecraftServer as part of the context, making single-player bypass mode functional in actor-less scenarios

Author: 3TUSK

src/main/java/org/teacon/areacontrol/AreaControl.java

@@ -17,6 +17,7 @@
 import net.neoforged.neoforge.event.server.ServerAboutToStartEvent;
 import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 import net.neoforged.neoforge.server.permission.events.PermissionGatherEvent;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.teacon.areacontrol.api.Area;
@@ -40,7 +41,7 @@ public final class AreaControl {
 
     private static final LevelResource SERVER_CONFIG = new LevelResource("serverconfig");
 
-    public static Predicate<MinecraftServer> singlePlayerServerChecker;
+    public static Predicate<@Nullable MinecraftServer> singlePlayerServerChecker;
 
     public AreaControl(ModContainer container, IEventBus modBus) {
         VERSION = container.getModInfo().getVersion().toString();

src/main/java/org/teacon/areacontrol/AreaControlEventHandlers.java

@@ -66,7 +66,7 @@ public static void vulnerabilityCheck(EntityInvulnerabilityCheckEvent event) {
                 }
             } else {
                 var entityTypeRegName = BuiltInRegistries.ENTITY_TYPE.getKey(attackTarget.getType());
-                allow = AreaChecks.checkPropFor(area, damageSrc, AreaProperties.ALLOW_PVE, entityTypeRegName, AreaControlConfig.allowPvE);
+                allow = AreaChecks.checkPropFor(area, damageSrc, level.getServer(), AreaProperties.ALLOW_PVE, entityTypeRegName, AreaControlConfig.allowPvE);
                 deniedFeedback = Component.translatable("area_control.notice.pve_disabled", ObjectArrays.EMPTY_ARRAY);
             }
             if (!allow) {

src/main/java/org/teacon/areacontrol/impl/AreaChecks.java

@@ -4,6 +4,7 @@
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
@@ -141,16 +142,36 @@ public static boolean checkPossess(Area area, Item item) {
     public static boolean checkPropFor(final @Nullable Area area, final @Nullable Entity actor,
                                        final @NotNull String prop, final @Nullable ResourceLocation targetId,
                                        final @Nullable Supplier<@NotNull Boolean> defaultValue) {
+        return checkPropFor(area, actor, null, prop, targetId, defaultValue);
+    }
+
+    /**
+     * Recursively checks if an action is allowed in given area
+     *
+     * @param area          Area to check
+     * @param actor         The entity that carries out the action
+     * @param currentServer The current server instance we are in
+     * @param prop          The action, represented by a string property
+     * @param targetId      The object on which the action is being carried out.
+     * @return true if such action is allowed; false otherwise.
+     */
+    public static boolean checkPropFor(final @Nullable Area area, final @Nullable Entity actor,
+                                       @Nullable MinecraftServer currentServer,
+                                       final @NotNull String prop, final @Nullable ResourceLocation targetId,
+                                       final @Nullable Supplier<@NotNull Boolean> defaultValue) {
         if (actor != null) {
-            // If actor is in single-player (without being published to LAN), then skip all checks.
-            if (AreaControl.singlePlayerServerChecker.test(actor.getServer())) {
-                return true;
+            if (currentServer == null) {
+                currentServer = actor.getServer();
             }
             // If bypass mode is activated, then skip all checks.
             if (AreaControlPlayerTracker.hasBypassModeOnForArea(actor, area)) {
                 return true;
             }
         }
+        // If we are in single-player (without being published to LAN), then skip all checks.
+        if (AreaControl.singlePlayerServerChecker.test(currentServer)) {
+            return true;
+        }
         if (targetId != null) {
             var objSpecific = AreaProperties.getBoolOptional(area, prop + "." + targetId);
             if (objSpecific.isPresent()) {