Merge branch 'master' into develop

# Conflicts:
#	plugin.yml
This commit is contained in:
Maxlego08 2020-04-24 16:15:58 +02:00
commit af3cb262d9
2 changed files with 3 additions and 1 deletions

View File

@ -107,6 +107,7 @@ public class KothLootManager extends ZUtils {
String finalCommand = command.replace("%player%", player.getName()); String finalCommand = command.replace("%player%", player.getName());
finalCommand = finalCommand.replace("%name%", koth.getName()); finalCommand = finalCommand.replace("%name%", koth.getName());
finalCommand = finalCommand.replace("%faction%", factionListener.getFactionTag(player));
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), finalCommand); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), finalCommand);
}); });
@ -115,6 +116,7 @@ public class KothLootManager extends ZUtils {
String finalCommand = command.replace("%player%", player.getName()); String finalCommand = command.replace("%player%", player.getName());
finalCommand = finalCommand.replace("%name%", koth.getName()); finalCommand = finalCommand.replace("%name%", koth.getName());
finalCommand = finalCommand.replace("%faction%", factionListener.getFactionTag(player));
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), finalCommand); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), finalCommand);
} }