Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed nullref exception during claim cleanup.

Browse Source 
Probably related to the new skeletal horses.
This commit is contained in:
ryanhamshire 2016-03-30 20:07:38 -07:00
parent 2e91b15c89
commit 5ff8558aa2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/me/ryanhamshire/GriefPrevention/DataStore.java
View File

@ -29,6 +29,7 @@ import me.ryanhamshire.GriefPrevention.events.ClaimDeletedEvent;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.AnimalTamer;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable; import org.bukkit.entity.Tameable;
@ -630,7 +631,15 @@ public abstract class DataStore
if(entity instanceof Tameable) if(entity instanceof Tameable)
{ {
Tameable pet = (Tameable)entity; Tameable pet = (Tameable)entity;
if(pet.isTamed() && pet.getOwner().getUniqueId().equals(claim.ownerID)) if(pet.isTamed())
{
AnimalTamer owner = pet.getOwner();
if(owner != null)
{
UUID ownerID = owner.getUniqueId();
if(ownerID != null)
{
if(ownerID.equals(claim.ownerID))
{ {
pet.setTamed(false); pet.setTamed(false);
} }
@ -639,6 +648,9 @@ public abstract class DataStore
} }
} }
} }
}
}
}
abstract void deleteClaimFromSecondaryStorage(Claim claim); abstract void deleteClaimFromSecondaryStorage(Claim claim);