mirror of
https://github.com/CitizensDev/Citizens2.git
synced 2024-10-01 00:27:45 +02:00
Merge selection fix
This commit is contained in:
parent
bd3640b1a0
commit
742a1a3a4e
@ -101,7 +101,8 @@ public class EventListen implements Listener {
|
|||||||
|
|
||||||
NPC npc = npcManager.getNPC(event.getEntity());
|
NPC npc = npcManager.getNPC(event.getEntity());
|
||||||
Player player = (Player) event.getTarget();
|
Player player = (Player) event.getTarget();
|
||||||
if (player.getMetadata("selected").size() == 0 || player.getMetadata("selected").get(0).asInt() != npc.getId()) {
|
if (!player.hasMetadata("selected") || player.getMetadata("selected").size() == 0
|
||||||
|
|| player.getMetadata("selected").get(0).asInt() != npc.getId()) {
|
||||||
if (player.getItemInHand().getTypeId() == Setting.SELECTION_ITEM.asInt()
|
if (player.getItemInHand().getTypeId() == Setting.SELECTION_ITEM.asInt()
|
||||||
&& (npc.getTrait(Owner.class).getOwner().equals(player.getName()) || player
|
&& (npc.getTrait(Owner.class).getOwner().equals(player.getName()) || player
|
||||||
.hasPermission("citizens.admin"))) {
|
.hasPermission("citizens.admin"))) {
|
||||||
|
Loading…
Reference in New Issue
Block a user