SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2026-02-06 12:17:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix permission system - also 1.0.4 release

Browse Source 
it was horribly broken :(
This commit is contained in:
PiggyPiglet
2026-02-02 21:39:05 +08:00
parent 5ab5d06fc6
commit 44ac2589a3
21 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/at/helpch/placeholderapi/commands/PlaceholderCommandRouter.java
View File

@@ -29,16 +29,9 @@ import java.util.concurrent.CompletableFuture;
import at.helpch.placeholderapi.PlaceholderAPIPlugin;
import at.helpch.placeholderapi.commands.impl.cloud.CommandECloud;
import at.helpch.placeholderapi.commands.impl.local.*;
import com.hypixel.hytale.component.Ref;
import com.hypixel.hytale.component.Store;
import com.hypixel.hytale.server.core.Message;
import com.hypixel.hytale.server.core.command.system.*;
import com.hypixel.hytale.server.core.command.system.CommandSender;
import com.hypixel.hytale.server.core.command.system.basecommands.AbstractPlayerCommand;
import com.hypixel.hytale.server.core.entity.entities.Player;
import com.hypixel.hytale.server.core.universe.PlayerRef;
import com.hypixel.hytale.server.core.universe.world.World;
import com.hypixel.hytale.server.core.universe.world.storage.EntityStore;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.Unmodifiable;
@@ -85,6 +78,11 @@ public final class PlaceholderCommandRouter extends AbstractCommand {
this.commands = commands;
}
@Override
protected boolean canGeneratePermission() {
return false;
}
@Override
protected @Nullable CompletableFuture<Void> execute(@NotNull final CommandContext context) {
final String[] args = context.getInputString().replace("papi", "").replace("placeholderapi", "").trim().split(" ");
@@ -108,8 +106,8 @@ public final class PlaceholderCommandRouter extends AbstractCommand {
return CompletableFuture.completedFuture(null);
}
final String permission = target.getPermission();
if (permission != null && !permission.isEmpty() && !sender.hasPermission(permission)) {
final Set<String> permissions = target.getPermissions();
if (permissions.stream().noneMatch(sender::hasPermission)) {
sender.sendMessage(Message.raw("You do not have permission to do this!").color(Color.RED));
return CompletableFuture.completedFuture(null);