Clean up unnecessary code in permission-api-v1

Legacy-Fabric · Jun 27, 2024 · 2ce7a52 · 2ce7a52
1 parent 26e9a5b
commit 2ce7a52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 34 deletions.
diff --git a/...ns-api-v1/1.6.4/src/main/java/net/legacyfabric/fabric/impl/permission/PermissionImpl.java b/...ns-api-v1/1.6.4/src/main/java/net/legacyfabric/fabric/impl/permission/PermissionImpl.java
@@ -17,13 +17,9 @@
 
 package net.legacyfabric.fabric.impl.permission;
 
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.server.MinecraftServer;
 
-import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
 
 import net.legacyfabric.fabric.api.permission.v1.PermissionsApiHolder;
 import net.legacyfabric.fabric.api.permission.v1.PlayerPermissionsApi;
@@ -44,19 +40,7 @@ public String getId() {
 
 		@Override
 		public boolean hasPermission(ServerPlayerEntity player, String perm) {
-			return getServer().getPlayerManager().canCheat(player.getUsername());
-		}
-	}
-
-	protected static MinecraftServer getServer() {
-		try {
-			return MinecraftServer.getServer();
-		} catch (NoSuchMethodError e) {
-			if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-				return MinecraftClient.getInstance().getServer();
-			} else {
-				return (MinecraftServer) FabricLoader.getInstance().getGameInstance();
-			}
+			return player.server.getPlayerManager().canCheat(player.getUsername());
 		}
 	}
 }
diff --git a/...ns-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/impl/permission/PermissionImpl.java b/...ns-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/impl/permission/PermissionImpl.java
@@ -17,13 +17,9 @@
 
 package net.legacyfabric.fabric.impl.permission;
 
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.server.MinecraftServer;
 
-import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
 
 import net.legacyfabric.fabric.api.permission.v1.PermissionsApiHolder;
 import net.legacyfabric.fabric.api.permission.v1.PlayerPermissionsApi;
@@ -44,19 +40,7 @@ public String getId() {
 
 		@Override
 		public boolean hasPermission(ServerPlayerEntity player, String perm) {
-			return getServer().getPlayerManager().isOperator(player.getGameProfile());
-		}
-	}
-
-	protected static MinecraftServer getServer() {
-		try {
-			return MinecraftServer.getServer();
-		} catch (NoSuchMethodError e) {
-			if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-				return MinecraftClient.getInstance().getServer();
-			} else {
-				return (MinecraftServer) FabricLoader.getInstance().getGameInstance();
-			}
+			return player.server.getPlayerManager().isOperator(player.getGameProfile());
 		}
 	}
 }