From 84973a025aaa6b49a1109f0fee8ad056f8b49989 Mon Sep 17 00:00:00 2001 From: 1whohears <1whohears28@gmail.com> Date: Thu, 26 May 2022 01:45:10 -0500 Subject: [PATCH] moved projectilesKeepTerrain to DataStats --- src/main/java/noppes/npcs/DataStats.java | 3 +++ src/main/java/noppes/npcs/entity/EntityNPCInterface.java | 4 ---- src/main/java/noppes/npcs/entity/EntityProjectile.java | 2 +- src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/DataStats.java b/src/main/java/noppes/npcs/DataStats.java index 48672d31f..acb1c691d 100644 --- a/src/main/java/noppes/npcs/DataStats.java +++ b/src/main/java/noppes/npcs/DataStats.java @@ -47,6 +47,7 @@ public class DataStats { public int pEffAmp = 0; public String fireSound = "random.bow"; public boolean aimWhileShooting = false; + public boolean projectilesKeepTerrain = false; public EnumCreatureAttribute creatureType = EnumCreatureAttribute.UNDEFINED; @@ -102,6 +103,7 @@ public class DataStats { compound.setInteger("pEffAmp", pEffAmp); compound.setString("FiringSound", fireSound); compound.setBoolean("AimWhileShooting", aimWhileShooting); + compound.setBoolean("ProjectilesKeepTerrain", projectilesKeepTerrain); compound.setBoolean("ImmuneToFire", immuneToFire); compound.setBoolean("PotionImmune", potionImmune); @@ -160,6 +162,7 @@ public class DataStats { pEffAmp = compound.getInteger("pEffAmp"); fireSound = compound.getString("FiringSound"); aimWhileShooting = compound.getBoolean("AimWhileShooting"); + projectilesKeepTerrain = compound.getBoolean("ProjectilesKeepTerrain"); immuneToFire = compound.getBoolean("ImmuneToFire"); potionImmune = compound.getBoolean("PotionImmune"); diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index a0b075600..0f8e81f60 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -139,7 +139,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public boolean updateClient = false; public boolean updateAI = false; - public boolean projectilesKeepTerrain = false; public FlyingMoveHelper flyMoveHelper = new FlyingMoveHelper(this); public PathNavigate flyNavigator = new PathNavigateFlying(this, worldObj); @@ -958,8 +957,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti linkedName = compound.getString("LinkedNpcName"); - projectilesKeepTerrain = compound.getBoolean("ProjectilesKeepTerrain"); - if(!isRemote()) LinkedNpcController.Instance.loadNpcData(this); @@ -991,7 +988,6 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti compound.setLong("TotalTicksAlive", totalTicksAlive); compound.setInteger("ModRev", npcVersion); compound.setString("LinkedNpcName", linkedName); - compound.setBoolean("ProjectilesKeepTerrain", projectilesKeepTerrain); } public void updateHitbox() { diff --git a/src/main/java/noppes/npcs/entity/EntityProjectile.java b/src/main/java/noppes/npcs/entity/EntityProjectile.java index dad83d04c..e0a1d0b21 100644 --- a/src/main/java/noppes/npcs/entity/EntityProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityProjectile.java @@ -139,7 +139,7 @@ public class EntityProjectile extends EntityThrowable { if (isNPC) { this.npc = (EntityNPCInterface) this.thrower; this.getStatProperties(this.npc.stats); - this.destroyTerrain = !this.npc.projectilesKeepTerrain; + this.destroyTerrain = !this.npc.stats.projectilesKeepTerrain; } } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 7775de977..dca330886 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -270,11 +270,11 @@ public class ScriptNpc extends ScriptLiving imp } public void setProjectilesKeepTerrain(boolean t) { - npc.projectilesKeepTerrain = t; + npc.stats.projectilesKeepTerrain = t; } public boolean getProjectilesKeepTerrain() { - return npc.projectilesKeepTerrain; + return npc.stats.projectilesKeepTerrain; }