Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix command signs

This commit is contained in:
Daniel Saukel 2021-03-13 15:15:24 +01:00
parent 5e7b28ea55
commit 77fbcdd68a
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandSign.java
View File

@ -36,7 +36,7 @@ import org.bukkit.entity.Player;
*/
public class CommandSign extends Windup {
private enum Executor {
public enum Executor {
DEFAULT,
OP,
CONSOLE
@ -78,6 +78,10 @@ public class CommandSign extends Windup {
return true;
}
public Executor getExecutor() {
return executor;
}
@Override
public boolean validate() {
script = ((DungeonsXL) api).getCommandScriptRegistry().get(getLine(1));
@ -159,12 +163,11 @@ public class CommandSign extends Windup {
public boolean activate(Player player) {
CommandSender sender = player;
boolean wasOp = player.isOp();
if (executor == Executor.OP) {
player.setOp(true);
} else if (executor == Executor.CONSOLE) {
if (executor == Executor.CONSOLE) {
sender = Bukkit.getConsoleSender();
}
((CommandTask) getRunnable()).setSender(sender, wasOp);
((CommandTask) getRunnable()).setPlayer(player);
startTask();
active = true;
return true;

19
core/src/main/java/de/erethon/dungeonsxl/sign/windup/CommandTask.java
View File

@ -47,6 +47,10 @@ public class CommandTask extends BukkitRunnable {
this.wasOp = wasOp;
}
public void setPlayer(Player player) {
this.player = player;
}
@Override
public void run() {
if (sign.isWorldFinished()) {
@ -56,22 +60,23 @@ public class CommandTask extends BukkitRunnable {
if (k >= script.getCommands().size()) {
sign.deactivate();
k = 0;
return;
}
String command = script.getCommands().get(k++)
.replace("%player%", sender.getName()).replace("%player_name%", sender.getName())
.replace("%world%", sign.getGameWorld().getWorld().getName()).replace("%world_name%", sign.getGameWorld().getWorld().getName());
if (player != null) {
command = command.replace("%player%", player.getName()).replace("%player_name%", player.getName());
}
if (sign.getExecutor() == CommandSign.Executor.OP) {
sender.setOp(true);
}
if (papi) {
Bukkit.getServer().dispatchCommand(sender, PlaceholderAPI.setPlaceholders(player, command));
} else {
Bukkit.getServer().dispatchCommand(sender, command);
}
}
@Override
public void cancel() {
super.cancel();
if (sender != Bukkit.getConsoleSender()) {
if (sign.getExecutor() == CommandSign.Executor.OP) {
sender.setOp(wasOp);
}
}