Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-16 20:31:30 +01:00
Code Issues Projects Releases Wiki Activity

Use contains for equipment editing commands

Browse Source
This commit is contained in:
fullwall 2017-08-22 20:30:29 +08:00
parent d67324c885
commit 20306de9a3
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/net/citizensnpcs/EventListen.java
View File

@ -119,8 +119,9 @@ public class EventListen implements Listener {
int owned = 0;
for (NPC npc : npcRegistry) {
if (!event.getNPC().equals(npc) && npc.hasTrait(Owner.class)
&& npc.getTrait(Owner.class).isOwnedBy(event.getCreator()))
&& npc.getTrait(Owner.class).isOwnedBy(event.getCreator())) {
owned++;
}
}
int wouldOwn = owned + 1;
if (wouldOwn > limit) {

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

@ -45,11 +45,11 @@ public class EquipmentEditor extends Editor {
@EventHandler(ignoreCancelled = true)
public void onPlayerChat(final AsyncPlayerChatEvent event) {
EquipmentSlot slot = null;
if (event.getMessage().equals("helmet")
if (event.getMessage().contains("helmet")
&& event.getPlayer().hasPermission("citizens.npc.edit.equip.any-helmet")) {
slot = EquipmentSlot.HELMET;
}
if (event.getMessage().equals("offhand")
if (event.getMessage().contains("offhand")
&& event.getPlayer().hasPermission("citizens.npc.edit.equip.offhand")) {
slot = EquipmentSlot.OFF_HAND;
}

4
main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java
View File

@ -81,8 +81,8 @@ public class ProfileFetcher {
request.setResult(NMS.fillProfileProperties(profile, true), ProfileFetchResult.SUCCESS);
} catch (Exception e) {
if (Messaging.isDebugging()) {
Messaging.debug(
"Profile lookup for player '" + profile.getName() + "' failed2: " + getExceptionMsg(e));
Messaging.debug("Profile lookup for player '" + profile.getName() + "' failed: "
+ getExceptionMsg(e) + " " + isTooManyRequests(e));
Messaging.debug(Throwables.getStackTraceAsString(e));
}

6
main/src/main/java/net/citizensnpcs/trait/Powered.java
View File

@ -17,15 +17,17 @@ public class Powered extends Trait implements Toggleable {
@Override
public void onSpawn() {
if (npc.getEntity() instanceof Creeper)
if (npc.getEntity() instanceof Creeper) {
((Creeper) npc.getEntity()).setPowered(powered);
}
}
@Override
public boolean toggle() {
powered = !powered;
if (npc.getEntity() instanceof Creeper)
if (npc.getEntity() instanceof Creeper) {
((Creeper) npc.getEntity()).setPowered(powered);
}
return powered;
}