Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-06 03:17:27 +02:00
Code Issues Projects Releases Wiki Activity

Check permissions properly for offhand/helmet equipping

Browse Source
This commit is contained in:
fullwall 2016-03-16 21:41:16 +08:00
parent 33f9c251ca
commit d9f4047434
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -916,7 +916,6 @@ public class NPCCommands {
Messaging.send(sender,
String.format(format, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), loc.getWorld().getName()));
}
npc.getNavigator().setTarget(Bukkit.getPlayerExact("fullwall"), true);
Messaging.send(sender, " <a>Traits<e>");
for (Trait trait : npc.getTraits()) {
if (CitizensAPI.getTraitFactory().isInternalTrait(trait))

6
src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
View File

@ -45,7 +45,7 @@ public class EquipmentEditor extends Editor {
@EventHandler(ignoreCancelled = true)
public void onPlayerChat(final AsyncPlayerChatEvent event) {
if (event.getMessage().equals("helmet")
&& !event.getPlayer().hasPermission("citizens.npc.edit.equip.any-helmet")) {
&& event.getPlayer().hasPermission("citizens.npc.edit.equip.any-helmet")) {
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
@Override
public void run() {
@ -61,9 +61,10 @@ public class EquipmentEditor extends Editor {
event.getPlayer().getInventory().setItemInMainHand(hand);
}
});
event.setCancelled(true);
}
if (event.getMessage().equals("offhand")
&& !event.getPlayer().hasPermission("citizens.npc.edit.equip.offhand")) {
&& event.getPlayer().hasPermission("citizens.npc.edit.equip.offhand")) {
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
@Override
public void run() {
@ -79,6 +80,7 @@ public class EquipmentEditor extends Editor {
event.getPlayer().getInventory().setItemInMainHand(hand);
}
});
event.setCancelled(true);
}
}