upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-11 21:57:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Animations now continue where they should be when players rejoin a world/server."

Browse Source 
This reverts commit a5ed14183e.
This commit is contained in:
Luis C.M committed 2024-03-24 18:59:27 -05:00
1 parent a5ed14183e
commit fd4a6d0a2c
7 files changed
+34 -117
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/ServerEventsHandler.java
+6 -18
View File
@@ -497,24 +497,12 @@ public class ServerEventsHandler {
@SubscribeEvent
public void playerTracking(PlayerEvent.StartTracking event){
if (event.target.worldObj.isRemote) return;
if(!(event.target instanceof EntityNPCInterface) || event.target.worldObj.isRemote)
return;
if(event.target instanceof EntityPlayerMP || event.target instanceof EntityNPCInterface) {
AnimationData animationData = AnimationData.getData(event.target);
if (animationData.isClientAnimating()) {
AnimationData playerAnimData = AnimationData.getData(event.entityPlayer);
Animation currentAnimation = animationData.currentClientAnimation;
NBTTagCompound compound = currentAnimation.writeToNBT();
playerAnimData.viewAnimation(currentAnimation, animationData, compound,
animationData.isClientAnimating(), currentAnimation.currentFrame, currentAnimation.currentFrameTime);
}
if (event.target instanceof EntityNPCInterface) {
MarkData data = MarkData.get((EntityNPCInterface) event.target);
if (data.marks.isEmpty())
return;
Server.sendData((EntityPlayerMP) event.entityPlayer, EnumPacketClient.MARK_DATA, event.target.getEntityId(), data.getNBT());
}
}
MarkData data = MarkData.get((EntityNPCInterface) event.target);
if(data.marks.isEmpty())
return;
Server.sendData((EntityPlayerMP)event.entityPlayer, EnumPacketClient.MARK_DATA, event.target.getEntityId(), data.getNBT());
}
}