Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-24 03:25:13 +01:00
Code Issues Projects Releases Wiki Activity

Wh-whee

Browse Source
This commit is contained in:
fullwall 2012-10-08 21:43:30 +08:00
parent 240db1efa0
commit a2c4228ed6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java
View File

@ -45,9 +45,10 @@ public class CitizensEndermanNPC extends CitizensMobNPC implements Equipable {
} }
ItemStack set = hand; ItemStack set = hand;
if (set.getType() != Material.AIR) { if (hand.getType() != Material.AIR) {
hand.setAmount(hand.getAmount() - 1); set = hand.clone();
set.setAmount(1); set.setAmount(1);
hand.setAmount(hand.getAmount() - 1);
} }
getTrait(Equipment.class).set(0, set); getTrait(Equipment.class).set(0, set);
} }

6
src/main/resources/messages_en.properties
View File

@ -1,22 +1,22 @@
citizens.changed-implementation=Citizens implementation changed, disabling plugin. citizens.changed-implementation=Citizens implementation changed, disabling plugin.
citizens.commands.citizens.save.help=Use the -a flag to save async (off the main server thread). citizens.commands.citizens.save.help=Use the -a flag to save async (off the main server thread).
citizens.commands.console-error=Please report this error: [See console] citizens.commands.console-error=Please report this error: [See console]
citizens.commands.help.command-missing=Command /{0} not found.
citizens.commands.help.header=Help citizens.commands.help.header=Help
citizens.commands.npc.behaviour.help=The scripts argument is a comma-separated list of file names. Scripts will be loaded automatically and run every tick. Use the [[-r]] flag to remove behaviours.
citizens.commands.npc.age.help=Can only be used on entities that can become babies. Use the [[-l]] flag to lock age over time (note: relogs may be required to see this).
citizens.commands.id-not-found=Couldn't find any NPC with ID {0}. citizens.commands.id-not-found=Couldn't find any NPC with ID {0}.
citizens.commands.invalid-mobtype={0} is not a valid mobtype. citizens.commands.invalid-mobtype={0} is not a valid mobtype.
citizens.commands.invalid-number=That is not a valid number. citizens.commands.invalid-number=That is not a valid number.
citizens.commands.npc.age.cannot-be-aged=The mob type '{0}' cannot be aged. citizens.commands.npc.age.cannot-be-aged=The mob type '{0}' cannot be aged.
citizens.commands.npc.age.help=Can only be used on entities that can become babies. Use the [[-l]] flag to lock age over time (note: relogs may be required to see this).
citizens.commands.npc.age.invalid-age=Invalid age. Valid ages are adult, baby, number between -24000 and 0 citizens.commands.npc.age.invalid-age=Invalid age. Valid ages are adult, baby, number between -24000 and 0
citizens.commands.npc.age.locked=Age locked. citizens.commands.npc.age.locked=Age locked.
citizens.commands.help.command-missing=Command /{0} not found.
citizens.commands.npc.age.set-adult=[[{0}]] is now an adult. citizens.commands.npc.age.set-adult=[[{0}]] is now an adult.
citizens.commands.npc.age.set-baby=[[{0}]] is now a baby. citizens.commands.npc.age.set-baby=[[{0}]] is now a baby.
citizens.commands.npc.age.set-normal=[[{0}]] is now age [[{1}]]. citizens.commands.npc.age.set-normal=[[{0}]] is now age [[{1}]].
citizens.commands.npc.age.set=[[{0}]] is now [[{1}]]. citizens.commands.npc.age.set=[[{0}]] is now [[{1}]].
citizens.commands.npc.age.unlocked=Age unlocked. citizens.commands.npc.age.unlocked=Age unlocked.
citizens.commands.npc.behaviour.added=Behaviours added. citizens.commands.npc.behaviour.added=Behaviours added.
citizens.commands.npc.behaviour.help=The scripts argument is a comma-separated list of file names. Scripts will be loaded automatically and run every tick. Use the [[-r]] flag to remove behaviours.
citizens.commands.npc.behaviour.removed=Behaviours removed. citizens.commands.npc.behaviour.removed=Behaviours removed.
citizens.commands.npc.controllable.not-controllable=[[{0}]] is not controllable. citizens.commands.npc.controllable.not-controllable=[[{0}]] is not controllable.
citizens.commands.npc.controllable.removed=[[{0}]] can no longer be controlled. citizens.commands.npc.controllable.removed=[[{0}]] can no longer be controlled.