@@ -40,6 +40,9 @@ public BukkitPlayerCaller(ServerCaller caller) {
4040
4141
4242 private Player getBukkitPlayer (UUID uuid ) {
43+ if (uuid == null ) {
44+ return null ;
45+ }
4346 return ((BukkitLoader ) getCaller ().getLoader ()).getServer ().getPlayer (uuid );
4447
4548 }
@@ -139,7 +142,7 @@ public String getPlayerWorld(String playerName) {
139142
140143 @ Override
141144 public String getPlayerWorld (UUID uuid ) {
142- Player p = (( BukkitLoader ) getCaller (). getLoader ()). getServer (). getPlayer (uuid );
145+ Player p = this . getBukkitPlayer (uuid );
143146 return (p != null ) ? p .getWorld ().getName () : "" ;
144147 }
145148
@@ -151,7 +154,7 @@ public boolean isOnline(String playerName) {
151154
152155 @ Override
153156 public boolean isOnline (UUID uuid ) {
154- return (( BukkitLoader ) getCaller (). getLoader ()). getServer (). getPlayer (uuid ) != null ;
157+ return this . getBukkitPlayer (uuid ) != null ;
155158 }
156159
157160 @ Override
@@ -209,7 +212,7 @@ public String getPlayerName(UUID uuid) {
209212
210213 @ Override
211214 public com .greatmancode .craftconomy3 .tools .entities .Player getPlayer (UUID uuid ) {
212- Player player = (( BukkitLoader ) getCaller (). getLoader ()). getServer (). getPlayer (uuid );
215+ Player player = this . getBukkitPlayer (uuid );
213216 if (player == null ) return null ;
214217 CommandSender sender = new PlayerCommandSender <>(player .getDisplayName (), player .getUniqueId (), player );
215218 return new com .greatmancode .craftconomy3 .tools .entities .Player (player .getName (),
@@ -231,7 +234,7 @@ public com.greatmancode.craftconomy3.tools.entities.Player getOnlinePlayer(Strin
231234
232235 @ Override
233236 public com .greatmancode .craftconomy3 .tools .entities .Player getOnlinePlayer (UUID uuid ) {
234- Player player = (( BukkitLoader ) getCaller (). getLoader ()). getServer (). getPlayer (uuid );
237+ Player player = this . getBukkitPlayer (uuid );
235238 if (player == null ) return null ;
236239 if (player .isOnline ()) {
237240 CommandSender sender = new PlayerCommandSender <>(player .getDisplayName (), player .getUniqueId (), player );
0 commit comments