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

Prevent nametag usage unless player can kill target (#1337)

Browse Source 
Addresses discussion #1333
This commit is contained in:
Adam 2021-05-29 15:36:02 -04:00 committed by GitHub
parent 64df0e8297
commit cac5aa04f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -57,6 +57,8 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent;
@ -1319,8 +1321,10 @@ class PlayerEventHandler implements Listener
} }
} }
ItemStack itemInHand = instance.getItemInHand(player, event.getHand());
//if preventing theft, prevent leashing claimed creatures //if preventing theft, prevent leashing claimed creatures
if (instance.config_claims_preventTheft && entity instanceof Creature && instance.getItemInHand(player, event.getHand()).getType() == Material.LEAD) if (instance.config_claims_preventTheft && entity instanceof Creature && itemInHand.getType() == Material.LEAD)
{ {
Claim claim = this.dataStore.getClaimAt(entity.getLocation(), false, playerData.lastClaim); Claim claim = this.dataStore.getClaimAt(entity.getLocation(), false, playerData.lastClaim);
if (claim != null) if (claim != null)
@ -1334,6 +1338,19 @@ class PlayerEventHandler implements Listener
} }
} }
} }
// Name tags may only be used on entities that the player is allowed to kill.
if (itemInHand.getType() == Material.NAME_TAG)
{
EntityDamageByEntityEvent damageEvent = new EntityDamageByEntityEvent(player, entity, EntityDamageEvent.DamageCause.CUSTOM, 0);
instance.getServer().getPluginManager().callEvent(damageEvent);
if (damageEvent.isCancelled())
{
event.setCancelled(true);
// Don't print message - damage event handler should have handled it.
return;
}
}
} }
//when a player throws an egg //when a player throws an egg