Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-27 04:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Another null check

Browse Source
This commit is contained in:
Garbage Mule 2011-09-25 15:27:28 +02:00
parent b0ec5b85c6
commit 5679a5b135
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
MobArena.jar
View File

Binary file not shown.

2
src/com/garbagemule/MobArena/Arena.java
View File

@ -809,7 +809,7 @@ public class Arena
{
for (Wolf w : pets)
{
if (w == null || !((Player) w.getOwner()).getName().equals(p.getName()))
if (w == null || !(w.getOwner() instanceof Player) || !((Player) w.getOwner()).getName().equals(p.getName()))
continue;
w.setOwner(null);

7
src/com/garbagemule/MobArena/MAUtils.java
View File

@ -391,6 +391,11 @@ public class MAUtils
{
// Grab the items from the MobArena .inv file
ItemStack[] stacks = getInventoryFile(p);
if (stacks == null)
{
MobArena.warning("Couldn't restore player inventory for '" + p.getName() + "'");
return false;
}
// If the player isn't online, hack the playerName.dat file
if (!p.isOnline())
@ -439,7 +444,7 @@ public class MAUtils
catch (Exception e)
{
e.printStackTrace();
MobArena.warning("Could not restore inventory for " + p.getName());
MobArena.warning("Could not get inventory file for '" + p.getName() + "'");
return null;
}
}