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

Derp - animate ARM_SWING not HURT

Browse Source
This commit is contained in:
fullwall 2012-10-30 22:11:12 +08:00
parent 85759d8ac7
commit 0742d777cc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
View File

@ -103,7 +103,7 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
} else if (handle instanceof EntityPlayer) {
EntityPlayer humanHandle = (EntityPlayer) handle;
humanHandle.attack(target);
PlayerAnimation.HURT.play(humanHandle.getBukkitEntity());
PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
} else {
NMS.attack(handle, target);
}

2
src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java
View File

@ -56,7 +56,7 @@ public class TriggerEditPrompt extends StringPrompt {
final Conversation conversation = new ConversationFactory(CitizensAPI.getPlugin())
.withLocalEcho(false).withEscapeSequence("exit").withEscapeSequence("/npc path")
.withModality(false).withFirstPrompt(new TriggerEditPrompt(editor)).buildConversation(player);
conversation.begin();
player.beginConversation(conversation);
return conversation;
}
}

2
src/main/java/net/citizensnpcs/util/PlayerAnimation.java
View File

@ -48,7 +48,7 @@ public enum PlayerAnimation {
radius);
}
},
SWING_ARM {
ARM_SWING {
@Override
protected void playAnimation(EntityPlayer player, int radius) {
Packet18ArmAnimation packet = new Packet18ArmAnimation(player, 1);