Fix function not being run as the Player that got the reward

ZockerAxel · Dec 26, 2021 · e97418e · e97418e
1 parent f8a7af2
commit e97418e
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/src/eu/endercentral/crazy_advancements/advancement/AdvancementFunctionReward.java b/src/eu/endercentral/crazy_advancements/advancement/AdvancementFunctionReward.java
@@ -1,9 +1,6 @@
 package eu.endercentral.crazy_advancements.advancement;
 
 import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_18_R1.command.ProxiedNativeCommandSender;
-import org.bukkit.craftbukkit.v1_18_R1.command.VanillaCommandWrapper;
 import org.bukkit.entity.Player;
 
 /**
@@ -48,21 +45,8 @@ public int getDelay() {
 
 	@Override
 	public final void onGrant(Player player) {
-		OpSender sender = new OpSender(player);
-		String command = (delay > 0 ? "schedule function " + getName() + " " + getDelay() + " append" : "function " + getName());
-		Bukkit.dispatchCommand(sender, command);
-	}
-
-
-	private static class OpSender extends ProxiedNativeCommandSender {
-
-		private static final CommandSender CONSOLE = Bukkit.getConsoleSender();
-
-		public OpSender(Player callee) {
-			super(VanillaCommandWrapper.getListener(CONSOLE), CONSOLE, callee);
-		}
-
-
+		String command = "execute as " + player.getName() + " at @s run " + (delay > 0 ? "schedule function " + getName() + " " + getDelay() + " append" : "function " + getName());
+		Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
 	}
 
 }