Upstream/CrazyAuctions
1
0
Fork 0
mirror of https://github.com/Crazy-Crew/CrazyAuctions.git synced 2024-09-21 03:21:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a NPE when a player can't be found.

Browse Source
This commit is contained in:
BadBones69 2019-09-22 19:47:48 -04:00
parent 53dc30a34b
commit cce3d5bd6b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/me/badbones69/crazyauctions/Methods.java
View File

@ -212,7 +212,11 @@ public class Methods {
}
public static Player getPlayer(String name) {
return Bukkit.getServer().getPlayer(name);
try {
return Bukkit.getServer().getPlayer(name);
}catch(Exception e) {
return null;
}
}
@SuppressWarnings("deprecation")
@ -388,12 +392,12 @@ public class Methods {
placeholders.put("%price%", getPrice(i, false));
placeholders.put("%Player%", winner);
placeholders.put("%player%", winner);
if(isOnline(winner)) {
if(isOnline(winner) && getPlayer(winner) != null) {
Player player = getPlayer(winner);
Bukkit.getPluginManager().callEvent(new AuctionWinBidEvent(player, data.getItemStack("Items." + i + ".Item"), price));
player.sendMessage(Messages.WIN_BIDDING.getMessage(placeholders));
}
if(isOnline(seller)) {
if(isOnline(seller) && getPlayer(seller) != null) {
Player player = getPlayer(seller);
player.sendMessage(Messages.SOMEONE_WON_PLAYERS_BID.getMessage(placeholders));
}
@ -404,7 +408,7 @@ public class Methods {
}else {
String seller = data.getString("Items." + i + ".Seller");
Player player = getPlayer(seller);
if(isOnline(seller)) {
if(isOnline(seller) && getPlayer(seller) != null) {
player.sendMessage(Messages.ITEM_HAS_EXPIRED.getMessage());
}
AuctionExpireEvent event = new AuctionExpireEvent((player != null ? player : Bukkit.getOfflinePlayer(seller)), data.getItemStack("Items." + i + ".Item"));

4
src/main/java/me/badbones69/crazyauctions/controllers/GUI.java
View File

@ -659,7 +659,7 @@ public class GUI implements Listener {
for(; data.contains("OutOfTime/Cancelled." + num); num++) ;
String seller = data.getString("Items." + i + ".Seller");
Player sellerPlayer = Methods.getPlayer(seller);
if(Methods.isOnline(seller)) {
if(Methods.isOnline(seller) && sellerPlayer != null) {
sellerPlayer.sendMessage(Messages.ADMIN_FORCE_CANCELLED_TO_PLAYER.getMessage());
}
AuctionCancelledEvent event = new AuctionCancelledEvent((sellerPlayer != null ? sellerPlayer : Bukkit.getOfflinePlayer(seller)), data.getItemStack("Items." + i + ".Item"), CancelledReason.ADMIN_FORCE_CANCEL);
@ -788,7 +788,7 @@ public class GUI implements Listener {
placeholders.put("%Player%", player.getName());
placeholders.put("%player%", player.getName());
player.sendMessage(Messages.BOUGHT_ITEM.getMessage(placeholders));
if(Methods.isOnline(seller)) {
if(Methods.isOnline(seller) && Methods.getPlayer(seller) != null) {
Player sell = Methods.getPlayer(seller);
sell.sendMessage(Messages.PLAYER_BOUGHT_ITEM.getMessage(placeholders));
}