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

Fix-up for "broken" abandoned pets.

Browse Source
This commit is contained in:
ryanhamshire 2016-04-15 21:08:36 -07:00
parent 9285e475a7
commit faee4efbef
1 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -1210,37 +1210,50 @@ class PlayerEventHandler implements Listener
if(entity instanceof Tameable) if(entity instanceof Tameable)
{ {
Tameable tameable = (Tameable)entity; Tameable tameable = (Tameable)entity;
if(tameable.isTamed() && tameable.getOwner() != null) if(tameable.isTamed())
{ {
UUID ownerID = tameable.getOwner().getUniqueId(); if(tameable.getOwner() != null)
{
UUID ownerID = tameable.getOwner().getUniqueId();
//if the player interacting is the owner or an admin in ignore claims mode, always allow //if the player interacting is the owner or an admin in ignore claims mode, always allow
if(player.getUniqueId().equals(ownerID) || playerData.ignoreClaims) if(player.getUniqueId().equals(ownerID) || playerData.ignoreClaims)
{
//if giving away pet, do that instead
if(playerData.petGiveawayRecipient != null)
{ {
tameable.setOwner(playerData.petGiveawayRecipient); //if giving away pet, do that instead
playerData.petGiveawayRecipient = null; if(playerData.petGiveawayRecipient != null)
GriefPrevention.sendMessage(player, TextMode.Success, Messages.PetGiveawayConfirmation); {
event.setCancelled(true); tameable.setOwner(playerData.petGiveawayRecipient);
} playerData.petGiveawayRecipient = null;
GriefPrevention.sendMessage(player, TextMode.Success, Messages.PetGiveawayConfirmation);
event.setCancelled(true);
}
return; return;
} }
if(!GriefPrevention.instance.pvpRulesApply(entity.getLocation().getWorld()) || GriefPrevention.instance.config_pvp_protectPets) if(!GriefPrevention.instance.pvpRulesApply(entity.getLocation().getWorld()) || GriefPrevention.instance.config_pvp_protectPets)
{ {
//otherwise disallow //otherwise disallow
OfflinePlayer owner = GriefPrevention.instance.getServer().getOfflinePlayer(ownerID); OfflinePlayer owner = GriefPrevention.instance.getServer().getOfflinePlayer(ownerID);
String ownerName = owner.getName(); String ownerName = owner.getName();
if(ownerName == null) ownerName = "someone"; if(ownerName == null) ownerName = "someone";
String message = GriefPrevention.instance.dataStore.getMessage(Messages.NotYourPet, ownerName); String message = GriefPrevention.instance.dataStore.getMessage(Messages.NotYourPet, ownerName);
if(player.hasPermission("griefprevention.ignoreclaims")) if(player.hasPermission("griefprevention.ignoreclaims"))
message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); message += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement);
GriefPrevention.sendMessage(player, TextMode.Err, message); GriefPrevention.sendMessage(player, TextMode.Err, message);
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
}
}
else //world repair code for a now-fixed GP bug
{
//ensure this entity can be tamed by players
tameable.setOwner(null);
if(tameable instanceof InventoryHolder)
{
InventoryHolder holder = (InventoryHolder)tameable;
holder.getInventory().clear();
}
} }
} }