Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 20:55:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix PlayerAnimation START_USE_ITEM

Browse Source
This commit is contained in:
fullwall 2016-03-26 01:45:13 +08:00
parent 03abd6384d
commit ae58175abe
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -287,8 +287,9 @@ public class CitizensNPC extends AbstractNPC {
nameVisibility = OptionStatus.ALWAYS; nameVisibility = OptionStatus.ALWAYS;
getEntity().setCustomName(getFullName()); getEntity().setCustomName(getFullName());
} }
if (getEntity() instanceof Player && data().has(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA)) { String teamName = data().get(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA, "");
String teamName = data().get(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA); if (getEntity() instanceof Player
&& Bukkit.getScoreboardManager().getMainScoreboard().getTeam(teamName) != null) {
Team team = Bukkit.getScoreboardManager().getMainScoreboard().getTeam(teamName); Team team = Bukkit.getScoreboardManager().getMainScoreboard().getTeam(teamName);
team.setOption(Option.NAME_TAG_VISIBILITY, nameVisibility); team.setOption(Option.NAME_TAG_VISIBILITY, nameVisibility);
if (data().has(NPC.GLOWING_COLOR_METADATA)) { if (data().has(NPC.GLOWING_COLOR_METADATA)) {

1
src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
View File

@ -45,6 +45,7 @@ public class CitizensNPCRegistry implements NPCRegistry {
Preconditions.checkNotNull(name, "name cannot be null"); Preconditions.checkNotNull(name, "name cannot be null");
Preconditions.checkNotNull(type, "type cannot be null"); Preconditions.checkNotNull(type, "type cannot be null");
CitizensNPC npc = getByType(type, uuid, id, name); CitizensNPC npc = getByType(type, uuid, id, name);
if (npc == null) if (npc == null)
throw new IllegalStateException("Could not create NPC."); throw new IllegalStateException("Could not create NPC.");
npcs.put(npc.getId(), npc); npcs.put(npc.getId(), npc);

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

@ -12,6 +12,7 @@ import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.trait.ArmorStandTrait; import net.citizensnpcs.trait.ArmorStandTrait;
import net.minecraft.server.v1_9_R1.BlockPosition; import net.minecraft.server.v1_9_R1.BlockPosition;
import net.minecraft.server.v1_9_R1.EntityPlayer; import net.minecraft.server.v1_9_R1.EntityPlayer;
import net.minecraft.server.v1_9_R1.EnumHand;
import net.minecraft.server.v1_9_R1.Packet; import net.minecraft.server.v1_9_R1.Packet;
import net.minecraft.server.v1_9_R1.PacketPlayOutAnimation; import net.minecraft.server.v1_9_R1.PacketPlayOutAnimation;
import net.minecraft.server.v1_9_R1.PacketPlayOutBed; import net.minecraft.server.v1_9_R1.PacketPlayOutBed;
@ -112,10 +113,18 @@ public enum PlayerAnimation {
radius); radius);
} }
}, },
START_USE_ITEM { START_USE_MAINHAND_ITEM {
@Override @Override
protected void playAnimation(EntityPlayer player, int radius) { protected void playAnimation(EntityPlayer player, int radius) {
player.f(true); player.c(EnumHand.MAIN_HAND);
sendPacketNearby(new PacketPlayOutEntityMetadata(player.getId(), player.getDataWatcher(), true), player,
radius);
}
},
START_USE_OFFHAND_ITEM {
@Override
protected void playAnimation(EntityPlayer player, int radius) {
player.c(EnumHand.OFF_HAND);
sendPacketNearby(new PacketPlayOutEntityMetadata(player.getId(), player.getDataWatcher(), true), player, sendPacketNearby(new PacketPlayOutEntityMetadata(player.getId(), player.getDataWatcher(), true), player,
radius); radius);
} }