mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 21:59:05 +00:00
Better Energy Charging Syncing
This commit is contained in:
1 parent
d36ec5c259
commit
930b7ed423
5 files changed
+157
-4
No files matched your search
@@ -26,6 +26,7 @@ import kamkeel.npcs.controllers.AttributeController;
|
||||
import kamkeel.npcs.controllers.ProfileController;
|
||||
import kamkeel.npcs.controllers.SyncController;
|
||||
import kamkeel.npcs.controllers.TelegraphController;
|
||||
import kamkeel.npcs.controllers.data.energycharge.EnergyChargeTracker;
|
||||
import kamkeel.npcs.controllers.data.profile.CNPCData;
|
||||
import kamkeel.npcs.developer.Developer;
|
||||
import kamkeel.npcs.entity.EntityAbilityBarrier;
|
||||
@@ -37,6 +38,7 @@ import kamkeel.npcs.entity.EntityAbilityPanel;
|
||||
import kamkeel.npcs.entity.EntityAbilitySweeper;
|
||||
import kamkeel.npcs.entity.EntityAbilityZone;
|
||||
import kamkeel.npcs.entity.EntityAbilityDome;
|
||||
import kamkeel.npcs.entity.EntityEnergyProjectile;
|
||||
import kamkeel.npcs.entity.EntityEnergySlicer;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
import kamkeel.npcs.util.BukkitUtil;
|
||||
@@ -430,8 +432,9 @@ public class CustomNpcs {
|
||||
AuctionController.Instance.save();
|
||||
}
|
||||
|
||||
kamkeel.npcs.entity.EntityEnergyProjectile.clearAllProjectiles();
|
||||
EntityEnergyProjectile.clearAllProjectiles();
|
||||
EntityAbilityBarrier.clearAllBarriers();
|
||||
EnergyChargeTracker.Instance.clear();
|
||||
|
||||
if (FMLCommonHandler.instance().getSide().isClient())
|
||||
clientJaninoCompiler = null;
|
||||
|
||||
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import kamkeel.npcs.controllers.SyncController;
|
||||
import kamkeel.npcs.controllers.data.energycharge.EnergyChargeTracker;
|
||||
import kamkeel.npcs.entity.EntityAbilityBarrier;
|
||||
import kamkeel.npcs.entity.EntityAbilityDome;
|
||||
import kamkeel.npcs.network.PacketHandler;
|
||||
@@ -300,6 +301,7 @@ public class ServerEventsHandler {
|
||||
public void invoke(LivingDeathEvent event) {
|
||||
if (event.entityLiving.worldObj.isRemote)
|
||||
return;
|
||||
EnergyChargeTracker.Instance.removeAllForCaster(event.entityLiving.getEntityId());
|
||||
if (event.source.getEntity() != null) {
|
||||
if (event.source.getEntity() instanceof EntityPlayer) {
|
||||
doExcalibur((EntityPlayer) event.source.getEntity(), event.entityLiving);
|
||||
@@ -535,7 +537,19 @@ public class ServerEventsHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public void playerTracking(PlayerEvent.StartTracking event) {
|
||||
if (!(event.target instanceof EntityPlayerMP || event.target instanceof EntityNPCInterface) || event.target.worldObj.isRemote)
|
||||
if (event.target.worldObj.isRemote) return;
|
||||
|
||||
// Energy charge visuals: send active charges for newly tracked entity
|
||||
if (event.target instanceof EntityLivingBase
|
||||
&& event.entityPlayer instanceof EntityPlayerMP) {
|
||||
EnergyChargeTracker.Instance.sendToPlayer(
|
||||
event.target.getEntityId(),
|
||||
(EntityPlayerMP) event.entityPlayer,
|
||||
(int) event.target.worldObj.getTotalWorldTime()
|
||||
);
|
||||
}
|
||||
|
||||
if (!(event.target instanceof EntityPlayerMP || event.target instanceof EntityNPCInterface))
|
||||
return;
|
||||
|
||||
AnimationData animationData = AnimationData.getData(event.target);
|
||||
|
||||
Reference in new issue
Block a user