Refactor player access and add entity spawn permission checks

Replaced direct `player` field access with `getPlatformPlayer()` calls for improved abstraction and consistency. Added permission validation for spawning entities via Axiom packets to ensure proper access control. Minor formatting and code cleanup were also performed for maintainability.

Author: JayemCeekay

Fabric/src/main/java/com/plotsquared/fabric/FabricPlatform.java

@@ -119,6 +119,7 @@
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.core.GlobalPos;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -173,7 +174,7 @@ public class FabricPlatform implements ModInitializer, PlotPlatform<ServerPlayer
     private boolean faweHook = false;
 
     private static CraftScheduler scheduler;
-
+    public PlotSquared plotSquared;
     private Injector injector;
 
     @Inject
@@ -262,7 +263,7 @@ public void onInitialize() {
             getScheduler().mainThreadHeartbeat(server.getTickCount());
         });
 
-        ServerLifecycleEvents.SERVER_STARTED.register(server -> {
+        ServerLifecycleEvents.SERVER_STARTED.register( server -> {
             SERVER = server;
             this.pluginName = "PlotSquared";
 
@@ -273,7 +274,7 @@ public void onInitialize() {
             PlotPlayer.registerConverter(ServerPlayer.class, FabricUtil::adapt);
             TaskManager.setPlatformImplementation(new FabricTaskManager(this, timeConverter));
 
-            final PlotSquared plotSquared = new PlotSquared(this, "Fabric");
+            plotSquared = new PlotSquared(this, "Fabric");
 
             // FastAsyncWorldEdit
             if (Settings.FAWE_Components.FAWE_HOOK) {

Fabric/src/main/java/com/plotsquared/fabric/listener/BlockEventListener.java

@@ -182,7 +182,7 @@ public static void sendBlockChange(final GlobalPos bloc, final net.minecraft.wor
                     if (16 * Math.abs(location.getX() - x) / 16 > distance || 16 * Math.abs(location.getZ() - z) / 16 > distance) {
                         continue;
                     }
-                    ((FabricPlayer) player).player.serverLevel().blockUpdated(bloc.pos(), data.getBlock());
+                    ((FabricPlayer) player).getPlatformPlayer().serverLevel().blockUpdated(bloc.pos(), data.getBlock());
                 }
             }
         }, TaskTime.ticks(3L));

Fabric/src/main/java/com/plotsquared/fabric/listener/ChunkListener.java

@@ -242,7 +242,7 @@ public InteractionResult onEntitySpawn(Entity entity) {
                entity.remove(Entity.RemovalReason.DISCARDED);
                 return InteractionResult.FAIL;
             }
-            if (!this.plotAreaManager.hasPlotArea(serverLevel.dimension().location().getPath().toString())) {
+            if (!this.plotAreaManager.hasPlotArea(serverLevel.dimension().location().getPath())) {
                 return InteractionResult.PASS;
             }
             Entity[] entities = FabricUtil.getEntitiesInChunk(serverLevel, chunk).toArray(new Entity[0]);

Fabric/src/main/java/com/plotsquared/fabric/listener/EntitySpawnListener.java

@@ -18,6 +18,7 @@
  */
 package com.plotsquared.fabric.listener;
 
+import com.moulberry.axiom.packets.AxiomServerboundSpawnEntity;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.location.Location;

Fabric/src/main/java/com/plotsquared/fabric/listener/ForceFieldListener.java

@@ -110,7 +110,7 @@ public static void handleForcefield(ServerPlayer player, PlotPlayer<?> plotPlaye
                 Set<PlotPlayer<?>> players = getNearbyPlayers(player, plot);
                 for (PlotPlayer<?> oPlayer : players) {
                     if (!oPlayer.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
-                        ((FabricPlayer) oPlayer).player
+                        ((FabricPlayer) oPlayer).getPlatformPlayer()
                                 .setDeltaMovement(calculateVelocity(plotPlayer, oPlayer));
                     }
                 }

Fabric/src/main/java/com/plotsquared/fabric/listener/HighFreqBlockEventListener.java

@@ -94,7 +94,7 @@ public static void sendBlockChange(GlobalPos bloc, final BlockState data) {
                     if (16 * Math.abs(location.getX() - x) / 16 > distance || 16 * Math.abs(location.getZ() - z) / 16 > distance) {
                         continue;
                     }
-                    ((FabricPlayer) player).player.serverLevel().blockUpdated(bloc.pos(), data.getBlock());
+                    ((FabricPlayer) player).getPlatformPlayer().serverLevel().blockUpdated(bloc.pos(), data.getBlock());
                 }
             }
         }, TaskTime.ticks(3L));

Fabric/src/main/java/com/plotsquared/fabric/listener/PlayerEventListener.java

@@ -89,9 +89,7 @@
 import com.sk89q.worldedit.world.entity.EntityType;
 import com.sk89q.worldedit.world.entity.EntityTypes;
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
-import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
 import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents;
 import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;
@@ -280,8 +278,11 @@ public PlayerEventListener(
         PlayerBlockBreakEvents.AFTER.register(this::afterBlockBreak);
         UseBlockCallback.EVENT.register(PlayerEventListener::interact);
         Stimuli.global().listen(PlayerCommandEvent.EVENT, PlayerEventListener::onPlayerCommand);
+
         ServerPlayConnectionEvents.INIT.register(PlayerEventListener::onLoginInit);
+
         Stimuli.global().listen(BlockUseEvent.EVENT, this::onHangingPlace);
+
         Stimuli.global().listen(EntitySpawnEvent.EVENT, entity -> {
             Location location = FabricUtil.adapt(GlobalPos.of(entity.level().dimension(), entity.blockPosition()));
             PlotArea area = location.getPlotArea();
@@ -296,50 +297,14 @@ public PlayerEventListener(
             }
             return InteractionResult.PASS;
         });
+
         Stimuli.global().listen(EntityDeathEvent.EVENT, this::onHangingBreakByEntity);
         Stimuli.global().listen(EntityUseEvent.EVENT, this::onPlayerInteractEntity);
         Stimuli.global().listen(EntityDeathEvent.EVENT, this::onVehicleDestroy);
         Stimuli.global().listen(EndPortalOpenEvent.EVENT, this::onEndPortalCreation);
         BaseFireBlockOnPlaceCallback.EVENT.register(this::onNetherPortalCreation);
         EntityHandleInsidePortalCallback.EVENT.register(this::onPortalEnter);
         LecternTakeButtonCallback.EVENT.register(this::onPlayerTakeLecternBook);
-        ServerEntityEvents.ENTITY_LOAD.register((entity, world) -> {
-            TaskManager.runTaskLater(() -> {
-                if (entity instanceof ServerPlayer serverPlayer) {
-                    final ServerPlayer player = serverPlayer;
-                    PlotSquared.platform().playerManager().removePlayer(player.getUUID());
-                    final PlotPlayer<ServerPlayer> pp = FabricUtil.adapt(player);
-
-                    // we're stripping the country code as we don't want to differ between countries
-                    //pp.setLocale(Locale.forLanguageTag(player.getLocale().substring(0, 2)));
-
-                    Location location = pp.getLocation();
-                    PlotArea area = location.getPlotArea();
-                    if (area != null) {
-                        Plot plot = area.getPlot(location);
-                        if (plot != null) {
-                            plotListener.plotEntry(pp, plot);
-                        }
-                    }
-                    // Async
-                    TaskManager.runTaskLaterAsync(() -> {
-                        /* TODO CHECK ON THIS */
-                /*if (!player.hasPlayedBefore() && player.isLocalPlayer()) {
-                    player.saveData();
-                }*/
-                        this.eventDispatcher.doJoinTask(pp);
-                    }, TaskTime.seconds(1L));
-                }
-            }, TaskTime.seconds(3L));
-
-        });
-        ServerLoginConnectionEvents.DISCONNECT.register(this::onLeave);
-        ServerPlayerEvents.AFTER_RESPAWN.register((oldPlayer, newPlayer, alive) -> {
-            ServerPlayer player = newPlayer;
-            PlotPlayer<ServerPlayer> pp = FabricUtil.adapt(player);
-            this.eventDispatcher.doRespawnTask(pp);
-        });
-
         HandlePlayerMoveCallback.EVENT.register((serverboundMovePlayerPacket, serverPlayer) -> {
             if (!serverboundMovePlayerPacket.hasPosition()) {
                 return InteractionResult.PASS;
@@ -361,11 +326,11 @@ public PlayerEventListener(
             if (MathMan.roundInt(from.pos().getX()) != (x2 = MathMan.roundInt(to.pos().getX()))) {
                 ServerPlayer player = serverPlayer;
                 FabricPlayer pp;
-                       try {
-                          pp = FabricUtil.adapt(player);
-                       } catch (Exception e ) {
-                           return InteractionResult.PASS;
-                       }
+                try {
+                    pp = FabricUtil.adapt(player);
+                } catch (Exception e) {
+                    return InteractionResult.PASS;
+                }
                 // Cancel teleport
                 if (TaskManager.removeFromTeleportQueue(pp.getName())) {
                     pp.sendMessage(TranslatableCaption.of("teleport.teleport_failed"));
@@ -562,6 +527,43 @@ public PlayerEventListener(
             }
             return InteractionResult.PASS;
         });
+
+        ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
+            TaskManager.runTaskLater(() -> {
+                final ServerPlayer player = handler.player;
+                PlotSquared.platform().playerManager().removePlayer(player.getUUID());
+                final PlotPlayer<ServerPlayer> pp = FabricUtil.adapt(player);
+
+                // we're stripping the country code as we don't want to differ between countries
+                //pp.setLocale(Locale.forLanguageTag(player.getLocale().substring(0, 2)));
+
+                Location location = pp.getLocation();
+                PlotArea area = location.getPlotArea();
+                if (area != null) {
+                    Plot plot = area.getPlot(location);
+                    if (plot != null) {
+                        plotListener.plotEntry(pp, plot);
+                    }
+                }
+                // Async
+                TaskManager.runTaskLaterAsync(() -> {
+                    /* TODO CHECK ON THIS */
+                /*if (!player.hasPlayedBefore() && player.isLocalPlayer()) {
+                    player.saveData();
+                }*/
+                    this.eventDispatcher.doJoinTask(pp);
+                }, TaskTime.seconds(1L));
+            }, TaskTime.seconds(3L));
+
+        });
+        ServerPlayConnectionEvents.DISCONNECT.register(this::onLeave);
+
+        ServerPlayerEvents.AFTER_RESPAWN.register((oldPlayer, newPlayer, alive) -> {
+            PlotPlayer<ServerPlayer> pp = FabricUtil.adapt(newPlayer);
+            this.eventDispatcher.doRespawnTask(pp);
+        });
+
+
         ServerPlayerTeleportToCallback.EVENT.register((serverLevel, x, y, z, set, g, h, serverPlayer) -> {
             ServerPlayer player = serverPlayer;
             //We need to account for bad plugins like NoCheatPlus that teleports player on/before login -_-
@@ -749,8 +751,10 @@ public PlayerEventListener(
             //cancel the original message
             return InteractionResult.FAIL;
         });
+
         ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register((player, origin, destination) -> {
-            TaskManager.runTaskLater(() -> {FabricPlayer pp = FabricUtil.adapt(player);
+            TaskManager.runTaskLater(() -> {
+                FabricPlayer pp = FabricUtil.adapt(player);
                 // Delete last location
                 Plot plot;
                 try (final MetaDataAccess<Plot> lastPlotAccess =
@@ -778,7 +782,8 @@ public PlayerEventListener(
                     if (plot != null) {
                         plotListener.plotEntry(pp, plot);
                     }
-                }}, TaskTime.seconds(3));
+                }
+            }, TaskTime.seconds(3));
 
         });
         Stimuli.global().listen(PlayerInventoryActionEvent.EVENT, (serverPlayer, i, clickType, i1) -> {
@@ -1529,9 +1534,9 @@ public InteractionResult onInventoryClose(
         return InteractionResult.PASS;
     }
 
-    public void onLeave(ServerLoginPacketListenerImpl handler, MinecraftServer server) {
-        TaskManager.removeFromTeleportQueue(handler.getUserName());
-        FabricPlayer pp = FabricUtil.adapt(FabricPlatform.SERVER.getPlayerList().getPlayerByName(handler.getUserName()));
+    public void onLeave(ServerGamePacketListenerImpl handler, MinecraftServer server) {
+        TaskManager.removeFromTeleportQueue(handler.player.getName().getString());
+        FabricPlayer pp = FabricUtil.adapt(handler.player);
         pp.unregister();
         plotListener.logout(pp.getUUID());
     }
@@ -1594,7 +1599,10 @@ public InteractionResult onBucketFill(Player player, Level level, InteractionHan
     }
 
     public InteractionResult onHangingPlace(ServerPlayer player, InteractionHand hand, BlockHitResult hitResult) {
-        if (player.getUseItem().getItem() instanceof HangingEntityItem || player.getUseItem().getItem().equals(Items.PAINTING) || player.getUseItem().getItem() instanceof LeadItem) {
+        if (player.getUseItem().getItem() instanceof HangingEntityItem || player
+                .getUseItem()
+                .getItem()
+                .equals(Items.PAINTING) || player.getUseItem().getItem() instanceof LeadItem) {
             Block block = player.serverLevel().getBlockState(hitResult.getBlockPos()).getBlock();
             Location location = FabricUtil.adapt(GlobalPos.of(player.serverLevel().dimension(), hitResult.getBlockPos()));
             PlotArea area = location.getPlotArea();
@@ -1786,7 +1794,9 @@ public InteractionResult onPlayerInteractEntity(
             }
         } else if ((plot != null && !plot.isAdded(pp.getUUID())) || (plot == null && area
                 .isRoadFlags())) {
-            final com.sk89q.worldedit.world.entity.EntityType entityType = EntityType.REGISTRY.get(entity.getType().toShortString());
+            final com.sk89q.worldedit.world.entity.EntityType entityType = EntityType.REGISTRY.get(entity
+                    .getType()
+                    .toShortString());
 
             FlagContainer flagContainer;
             if (plot == null) {

Fabric/src/main/java/com/plotsquared/fabric/listener/ProjectileEventListener.java

@@ -153,6 +153,9 @@ public InteractionResult onProjectileHit(Projectile entity, BlockHitResult block
         }
         Plot plot = area.getPlot(location);
         Entity shooter = entity.getOwner();
+        if (shooter == null) {
+            return InteractionResult.FAIL;
+        }
         if (shooter instanceof ServerPlayer player) {
             if (!(player.connection.isAcceptingMessages())) {
                 if (plot != null) {

Fabric/src/main/java/com/plotsquared/fabric/listener/mixin/AxiomServerboundSpawnEntityMixin.java

@@ -0,0 +1,22 @@
+package com.plotsquared.fabric.listener.mixin;
+
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.moulberry.axiom.packets.AxiomServerboundSpawnEntity;
+import net.luckperms.api.LuckPermsProvider;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(AxiomServerboundSpawnEntity.class)
+public class AxiomServerboundSpawnEntityMixin {
+
+
+    @WrapMethod(method = "handle")
+    public void onHandle(MinecraftServer server, ServerPlayer player, Operation<Void> original){
+        if(LuckPermsProvider.get().getUserManager().getUser(player.getUUID()).getCachedData().getPermissionData().checkPermission("axiom.entity.spawn").asBoolean()) {
+            original.call(server, player);
+        }
+    }
+
+}

Fabric/src/main/java/com/plotsquared/fabric/placeholder/PlaceholderFormatter.java

@@ -34,7 +34,7 @@ public void format(final @NonNull ChatContext context) {
             if (context.isRawOutput()) {
                 context.setMessage(context.getMessage().replace('%', '\u2010'));
             } else {
-                final ServerPlayer player = ((FabricPlayer) recipient).player;
+                final ServerPlayer player = ((FabricPlayer) recipient).getPlatformPlayer();
                // context.setMessage(MiniPlaceholders.);
                 //context.setMessage(PlaceholderAPI.setPlaceholders(player, context.getMessage()));
             }