Fixed major issue with cooldown exempt permission

Picono435 · Aug 10, 2021 · 57856bb · 57856bb
1 parent 4fd7d8e
commit 57856bb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/fabric/src/main/java/com/gmail/picono435/randomtp/api/fabric/RandomTPAPIImpl.java b/fabric/src/main/java/com/gmail/picono435/randomtp/api/fabric/RandomTPAPIImpl.java
@@ -3,6 +3,7 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -15,4 +16,8 @@ public static boolean hasPermission(CommandSourceStack source, String permission
 		return Permissions.check(source, permission, registeredNodes.get(permission));
 	}
 
+	public static boolean hasPermission(ServerPlayer player, String permission) {
+		return Permissions.check(player, permission, registeredNodes.get(permission));
+	}
+
 }
diff --git a/fabric/src/main/java/com/gmail/picono435/randomtp/fabric/RandomTPModFabric.java b/fabric/src/main/java/com/gmail/picono435/randomtp/fabric/RandomTPModFabric.java
@@ -34,7 +34,7 @@ public void onInitialize() {
 
             RandomTPAPIImpl.registeredNodes.put("randomtp.command.basic", 0);
             RandomTPAPIImpl.registeredNodes.put("randomtp.command.interdim", 0);
-            RandomTPAPIImpl.registeredNodes.put("randomtp.command.exempt", 1);
+            RandomTPAPIImpl.registeredNodes.put("randomtp.cooldown.exempt", 1);
 
             RandomTP.getLogger().info("RandomTP successfully loaded.");
         });

diff --git a/forge/src/main/java/com/gmail/picono435/randomtp/api/forge/RandomTPAPIImpl.java b/forge/src/main/java/com/gmail/picono435/randomtp/api/forge/RandomTPAPIImpl.java
@@ -2,10 +2,11 @@
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.server.permission.PermissionAPI;
 
 public class RandomTPAPIImpl {
-	
+
 	public static boolean hasPermission(CommandSourceStack source, String permission) {
 		try {
 			return PermissionAPI.hasPermission(source.getPlayerOrException(), permission);
@@ -14,4 +15,8 @@ public static boolean hasPermission(CommandSourceStack source, String permission
 		}
 	}
 
+	public static boolean hasPermission(ServerPlayer player, String permission) {
+		return PermissionAPI.hasPermission(player, permission);
+	}
+
 }