mirror of
https://github.com/CitizensDev/Citizens2.git
synced 2024-09-28 15:17:43 +02:00
Add PlayerAnimation#CRIT and MAGIC_CRIT
This commit is contained in:
parent
870825d212
commit
2d973e7575
@ -867,10 +867,8 @@ public class NPCCommands {
|
|||||||
@Requirements(selected = true, ownership = true, types = { EntityType.VILLAGER })
|
@Requirements(selected = true, ownership = true, types = { EntityType.VILLAGER })
|
||||||
public void profession(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
|
public void profession(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
|
||||||
String profession = args.getString(1);
|
String profession = args.getString(1);
|
||||||
Profession parsed;
|
Profession parsed = Util.matchEnum(Profession.values(), profession.toUpperCase());
|
||||||
try {
|
if (parsed == null) {
|
||||||
parsed = Profession.valueOf(profession.toUpperCase());
|
|
||||||
} catch (IllegalArgumentException ex) {
|
|
||||||
throw new CommandException(Messages.INVALID_PROFESSION);
|
throw new CommandException(Messages.INVALID_PROFESSION);
|
||||||
}
|
}
|
||||||
npc.getTrait(VillagerProfession.class).setProfession(parsed);
|
npc.getTrait(VillagerProfession.class).setProfession(parsed);
|
||||||
|
@ -19,6 +19,13 @@ public enum PlayerAnimation {
|
|||||||
sendPacketNearby(packet, player, radius);
|
sendPacketNearby(packet, player, radius);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
CRIT {
|
||||||
|
@Override
|
||||||
|
protected void playAnimation(EntityPlayer player, int radius) {
|
||||||
|
Packet18ArmAnimation packet = new Packet18ArmAnimation(player, 6);
|
||||||
|
sendPacketNearby(packet, player, radius);
|
||||||
|
}
|
||||||
|
},
|
||||||
HURT {
|
HURT {
|
||||||
@Override
|
@Override
|
||||||
protected void playAnimation(EntityPlayer player, int radius) {
|
protected void playAnimation(EntityPlayer player, int radius) {
|
||||||
@ -26,6 +33,13 @@ public enum PlayerAnimation {
|
|||||||
sendPacketNearby(packet, player, radius);
|
sendPacketNearby(packet, player, radius);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
MAGIC_CRIT {
|
||||||
|
@Override
|
||||||
|
protected void playAnimation(EntityPlayer player, int radius) {
|
||||||
|
Packet18ArmAnimation packet = new Packet18ArmAnimation(player, 7);
|
||||||
|
sendPacketNearby(packet, player, radius);
|
||||||
|
}
|
||||||
|
},
|
||||||
SIT {
|
SIT {
|
||||||
@Override
|
@Override
|
||||||
protected void playAnimation(EntityPlayer player, int radius) {
|
protected void playAnimation(EntityPlayer player, int radius) {
|
||||||
|
@ -6,7 +6,6 @@ import net.citizensnpcs.api.util.Colorizer;
|
|||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
|
||||||
public class StringHelper {
|
public class StringHelper {
|
||||||
|
|
||||||
public static String capitalize(Object string) {
|
public static String capitalize(Object string) {
|
||||||
String capitalize = string.toString();
|
String capitalize = string.toString();
|
||||||
return capitalize.length() == 0 ? "" : Character.toUpperCase(capitalize.charAt(0))
|
return capitalize.length() == 0 ? "" : Character.toUpperCase(capitalize.charAt(0))
|
||||||
|
Loading…
Reference in New Issue
Block a user