diff --git a/Common/src/main/java/dev/cammiescorner/arcanus/api/entities/Targetable.java b/Common/src/main/java/dev/cammiescorner/arcanus/api/entities/Targetable.java
index 7028bda6..55927bfe 100644
--- a/Common/src/main/java/dev/cammiescorner/arcanus/api/entities/Targetable.java
+++ b/Common/src/main/java/dev/cammiescorner/arcanus/api/entities/Targetable.java
@@ -1,13 +1,14 @@
 package dev.cammiescorner.arcanus.api.entities;
 
+import dev.cammiescorner.arcanus.common.MainDuck;
+import dev.cammiescorner.arcanus.common.MainHelper;
 import dev.cammiescorner.arcanus.common.util.PlayerHelper;
 import net.minecraft.world.entity.Entity;
 
 public interface Targetable {
 	default boolean arcanus$canBeTargeted() {
-		if(this instanceof Entity self) {
-			return !PlayerHelper.isFakePlayer(self);
-		}
+		if(this instanceof Entity self)
+			return !MainHelper.isFakePlayer(self);
 
 		return false;
 	}
diff --git a/Common/src/main/java/dev/cammiescorner/arcanus/client/ClientHelper.java b/Common/src/main/java/dev/cammiescorner/arcanus/client/ClientHelper.java
index 6af7e868..b0254e4a 100644
--- a/Common/src/main/java/dev/cammiescorner/arcanus/client/ClientHelper.java
+++ b/Common/src/main/java/dev/cammiescorner/arcanus/client/ClientHelper.java
@@ -3,5 +3,5 @@
 import dev.upcraft.sparkweave.api.platform.Services;
 
 public class ClientHelper {
-	private static final ClientDuck CLIENT_DUCK = Services.getService(ClientDuck.class);
+	private static final ClientDuck clientDuck = Services.getService(ClientDuck.class);
 }
diff --git a/Common/src/main/java/dev/cammiescorner/arcanus/common/MainDuck.java b/Common/src/main/java/dev/cammiescorner/arcanus/common/MainDuck.java
index 7beb51f4..d925bd38 100644
--- a/Common/src/main/java/dev/cammiescorner/arcanus/common/MainDuck.java
+++ b/Common/src/main/java/dev/cammiescorner/arcanus/common/MainDuck.java
@@ -1,4 +1,7 @@
 package dev.cammiescorner.arcanus.common;
 
+import net.minecraft.world.entity.Entity;
+
 public interface MainDuck {
+	boolean isFakePlayer(Entity entity);
 }
diff --git a/Common/src/main/java/dev/cammiescorner/arcanus/common/MainHelper.java b/Common/src/main/java/dev/cammiescorner/arcanus/common/MainHelper.java
index 0d85dbb9..ec298ef4 100644
--- a/Common/src/main/java/dev/cammiescorner/arcanus/common/MainHelper.java
+++ b/Common/src/main/java/dev/cammiescorner/arcanus/common/MainHelper.java
@@ -1,7 +1,12 @@
 package dev.cammiescorner.arcanus.common;
 
 import dev.upcraft.sparkweave.api.platform.Services;
+import net.minecraft.world.entity.Entity;
 
 public class MainHelper {
-	private static final MainDuck MAIN_DUCK = Services.getService(MainDuck.class);
+	private static final MainDuck mainDuck = Services.getService(MainDuck.class);
+
+	public static boolean isFakePlayer(Entity entity) {
+		return mainDuck.isFakePlayer(entity);
+	}
 }
diff --git a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/FabricMainDuck.java b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/FabricMainDuck.java
index ce752a57..00625210 100644
--- a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/FabricMainDuck.java
+++ b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/FabricMainDuck.java
@@ -1,6 +1,12 @@
 package dev.cammiescorner.arcanus.fabric.common;
 
 import dev.cammiescorner.arcanus.common.MainDuck;
+import net.fabricmc.fabric.api.entity.FakePlayer;
+import net.minecraft.world.entity.Entity;
 
 public class FabricMainDuck implements MainDuck {
+	@Override
+	public boolean isFakePlayer(Entity entity) {
+		return entity instanceof FakePlayer;;
+	}
 }
diff --git a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/components/level/PocketDimensionComponent.java b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/components/level/PocketDimensionComponent.java
index 895e9122..07f91e9e 100644
--- a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/components/level/PocketDimensionComponent.java
+++ b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/components/level/PocketDimensionComponent.java
@@ -2,6 +2,8 @@
 
 import com.google.common.base.Preconditions;
 import com.mojang.authlib.GameProfile;
+import dev.cammiescorner.arcanus.common.MainHelper;
+import dev.cammiescorner.arcanus.fabric.common.FabricMainDuck;
 import dev.cammiescorner.arcanus.fabric.entrypoints.FabricMain;
 import dev.cammiescorner.arcanus.ArcanusConfig;
 import dev.cammiescorner.arcanus.fabric.common.blocks.SpatialRiftExitBlock;
@@ -9,7 +11,6 @@
 import dev.cammiescorner.arcanus.fabric.common.data.ArcanusDimensions;
 import dev.cammiescorner.arcanus.fabric.common.registry.ArcanusBlocks;
 import dev.cammiescorner.arcanus.fabric.common.registry.ArcanusComponents;
-import dev.cammiescorner.arcanus.fabric.common.util.PlayerHelper;
 import net.fabricmc.fabric.api.dimension.v1.FabricDimensions;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -145,7 +146,7 @@ else if(!chunksExist(plot, pocketDim)) {
 	}
 
 	public boolean teleportOutOfPocketDimension(Entity entity) {
-		if(PlayerHelper.isFakePlayer(entity) || entity.level().isClientSide() || entity.level().dimension() != ArcanusDimensions.POCKET_DIMENSION)
+		if(MainHelper.isFakePlayer(entity) || entity.level().isClientSide() || entity.level().dimension() != ArcanusDimensions.POCKET_DIMENSION)
 			return false;
 
 		UUID ownerId = existingPlots.values().stream().filter(plot -> entity.getBoundingBox().intersects(AABB.of(plot.getBounds()))).map(PocketDimensionPlot::ownerId).findFirst().orElse(null);
@@ -273,7 +274,7 @@ public boolean replacePlotSpace(UUID target, ServerLevel pocketDim, RegenerateTy
 
 		if(regenerateType.clearInterior()) {
 			pocketDim.getEntitiesOfClass(Entity.class, AABB.of(plot.getBounds())).forEach(entity -> {
-				if(PlayerHelper.isFakePlayer(entity) || !(entity instanceof ServerPlayer player)) {
+				if(MainHelper.isFakePlayer(entity) || !(entity instanceof ServerPlayer player)) {
 					entity.discard();
 					return;
 				}
diff --git a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/entities/magic/MagicRuneEntity.java b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/entities/magic/MagicRuneEntity.java
index 64cf5374..5a12ce10 100644
--- a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/entities/magic/MagicRuneEntity.java
+++ b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/entities/magic/MagicRuneEntity.java
@@ -1,5 +1,7 @@
 package dev.cammiescorner.arcanus.fabric.common.entities.magic;
 
+import dev.cammiescorner.arcanus.common.MainHelper;
+import dev.cammiescorner.arcanus.fabric.common.FabricMainDuck;
 import dev.cammiescorner.arcanus.fabric.entrypoints.FabricMain;
 import dev.cammiescorner.arcanus.ArcanusConfig;
 import dev.cammiescorner.arcanus.api.entities.Targetable;
@@ -7,7 +9,6 @@
 import dev.cammiescorner.arcanus.api.spells.SpellGroup;
 import dev.cammiescorner.arcanus.api.spells.SpellShape;
 import dev.cammiescorner.arcanus.fabric.common.data.ArcanusEntityTags;
-import dev.cammiescorner.arcanus.fabric.common.util.PlayerHelper;
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -141,7 +142,7 @@ public void setProperties(UUID casterId, Entity sourceEntity, Vec3 pos, ItemStac
 	}
 
 	private static boolean isValidTarget(LivingEntity livingEntity) {
-		if(!livingEntity.isAlive() || livingEntity.isSpectator() || livingEntity.isIgnoringBlockTriggers() || PlayerHelper.isFakePlayer(livingEntity)) {
+		if(!livingEntity.isAlive() || livingEntity.isSpectator() || livingEntity.isIgnoringBlockTriggers() || MainHelper.isFakePlayer(livingEntity)) {
 			return false;
 		}
 
diff --git a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/entities/magic/PocketDimensionPortalEntity.java b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/entities/magic/PocketDimensionPortalEntity.java
index b01a84ed..e86dc101 100644
--- a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/entities/magic/PocketDimensionPortalEntity.java
+++ b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/entities/magic/PocketDimensionPortalEntity.java
@@ -2,10 +2,11 @@
 
 import dev.cammiescorner.arcanus.ArcanusConfig;
 import dev.cammiescorner.arcanus.api.entities.Targetable;
+import dev.cammiescorner.arcanus.common.MainHelper;
+import dev.cammiescorner.arcanus.fabric.common.FabricMainDuck;
 import dev.cammiescorner.arcanus.fabric.common.components.level.PocketDimensionComponent;
 import dev.cammiescorner.arcanus.fabric.common.data.ArcanusEntityTags;
 import dev.cammiescorner.arcanus.fabric.common.registry.ArcanusComponents;
-import dev.cammiescorner.arcanus.fabric.common.util.PlayerHelper;
 import net.minecraft.Util;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
@@ -145,7 +146,7 @@ public void setProperties(UUID casterId, Vec3 pos, double pullStrength) {
 	}
 
 	private static boolean canTeleportSafely(Entity entity) {
-		if(entity.isSpectator() || !entity.isAlive() || !entity.canChangeDimensions() || PlayerHelper.isFakePlayer(entity))
+		if(entity.isSpectator() || !entity.isAlive() || !entity.canChangeDimensions() || MainHelper.isFakePlayer(entity))
 			return false;
 
 		return !entity.getType().is(ArcanusEntityTags.SPATIAL_RIFT_IMMUNE);
diff --git a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/util/PlayerHelper.java b/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/util/PlayerHelper.java
deleted file mode 100644
index e9e6fbb6..00000000
--- a/Fabric/src/main/java/dev/cammiescorner/arcanus/fabric/common/util/PlayerHelper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package dev.cammiescorner.arcanus.fabric.common.util;
-
-import net.fabricmc.fabric.api.entity.FakePlayer;
-import net.minecraft.world.entity.Entity;
-
-public class PlayerHelper {
-
-	public static boolean isFakePlayer(Entity entity) {
-		return entity instanceof FakePlayer;
-	}
-}