Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for Bukkit 1.20 and fix for give message #197

Closed
wants to merge 2 commits into from
+7 −5
Closed

Support for Bukkit 1.20 and fix for give message #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8e23ce
Fix exception while trying to get player for console command (fix #196)
EpiCanard Jul 9, 2023
6623f3b
Fix message not send to player for money give (fix #111)
EpiCanard Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/greatmancode/craftconomy3/commands/money/GiveCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void execute(CommandSender sender, String[] args) {
if (reciever != null) {
Common.getInstance().getServerCaller().getPlayerCaller().sendMessage(reciever.getUuid(), Common
.getInstance().getLanguageManager().parse("money_give_received", Common.getInstance().format
(worldName, currency, amount), sender.getName()), this.getName());
(worldName, currency, amount), sender.getName()));
}
}
} else {
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/com/greatmancode/craftconomy3/tools/caller/bukkit/BukkitPlayerCaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public BukkitPlayerCaller(ServerCaller caller) {


private Player getBukkitPlayer(UUID uuid) {
if (uuid == null)
return null;
return ((BukkitLoader) getCaller().getLoader()).getServer().getPlayer(uuid);

}
Expand Down Expand Up @@ -139,7 +141,7 @@ public String getPlayerWorld(String playerName) {

@Override
public String getPlayerWorld(UUID uuid) {
Player p = ((BukkitLoader) getCaller().getLoader()).getServer().getPlayer(uuid);
Player p = getBukkitPlayer(uuid);
return (p != null) ? p.getWorld().getName() : "";
}

Expand All @@ -151,7 +153,7 @@ public boolean isOnline(String playerName) {

@Override
public boolean isOnline(UUID uuid) {
return ((BukkitLoader) getCaller().getLoader()).getServer().getPlayer(uuid) != null;
return getBukkitPlayer(uuid) != null;
}

@Override
Expand Down Expand Up @@ -209,7 +211,7 @@ public String getPlayerName(UUID uuid) {

@Override
public com.greatmancode.craftconomy3.tools.entities.Player getPlayer(UUID uuid) {
Player player = ((BukkitLoader) getCaller().getLoader()).getServer().getPlayer(uuid);
Player player = getBukkitPlayer(uuid);
if (player == null) return null;
CommandSender sender = new PlayerCommandSender<>(player.getDisplayName(), player.getUniqueId(), player);
return new com.greatmancode.craftconomy3.tools.entities.Player(player.getName(),
Expand All @@ -231,7 +233,7 @@ public com.greatmancode.craftconomy3.tools.entities.Player getOnlinePlayer(Strin

@Override
public com.greatmancode.craftconomy3.tools.entities.Player getOnlinePlayer(UUID uuid) {
Player player = ((BukkitLoader) getCaller().getLoader()).getServer().getPlayer(uuid);
Player player = getBukkitPlayer(uuid);
if (player == null) return null;
if (player.isOnline()) {
CommandSender sender = new PlayerCommandSender<>(player.getDisplayName(), player.getUniqueId(), player);
Expand Down