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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vidal committed 2026-03-09 18:48:12 -03:00
2 parents 0244db1e5c d8b18d7058
commit 3bf93a128c
5 files changed
+12 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java
+3 -3
View File
@@ -201,7 +201,7 @@ public class EntityAbilityZone extends Entity implements IEntityAdditionalSpawnD
double x, double y, double z) {
this(world);
this.zoneType = type;
this.ownerEntityId = owner.getEntityId();
this.ownerEntityId = owner != null ? owner.getEntityId() : -1;
// Snap to ground with tiny offset to prevent z-clipping
double groundY = Ability.findGroundLevel(world, x, y, z) + GROUND_OFFSET;
this.setPosition(x, groundY, z);
@@ -213,7 +213,7 @@ public class EntityAbilityZone extends Entity implements IEntityAdditionalSpawnD
*/
public void initAsHazard(Entity owner, double x, double y, double z) {
this.zoneType = ZoneType.HAZARD;
this.ownerEntityId = owner.getEntityId();
this.ownerEntityId = owner != null ? owner.getEntityId() : -1;
double groundY = Ability.findGroundLevel(worldObj, x, y, z) + GROUND_OFFSET;
this.setPosition(x, groundY, z);
this.ticksSinceDamage = damageInterval;
@@ -225,7 +225,7 @@ public class EntityAbilityZone extends Entity implements IEntityAdditionalSpawnD
*/
public void initAsTrap(Entity owner, double x, double y, double z) {
this.zoneType = ZoneType.TRAP;
this.ownerEntityId = owner.getEntityId();
this.ownerEntityId = owner != null ? owner.getEntityId() : -1;
double groundY = Ability.findGroundLevel(worldObj, x, y, z) + GROUND_OFFSET;
this.setPosition(x, groundY, z);
this.ticksSinceLastTrigger = triggerCooldown;
src/main/java/kamkeel/npcs/entity/EntityEnergyDome.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class EntityEnergyDome extends EntityEnergyBarrier {
this(world);
this.noClip = true;
this.stepHeight = 0.0F;
this.ownerEntityId = owner.getEntityId();
this.ownerEntityId = owner != null ? owner.getEntityId() : -1;
this.setDomeRadius(domeRadius);
// Defensive copy: entities must never share data objects with the source ability.
this.displayData = display != null ? display.copy() : new EnergyDisplayData();
src/main/java/kamkeel/npcs/entity/EntityEnergyPanel.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class EntityEnergyPanel extends EntityEnergyBarrier {
EnergyBarrierData barrier, EnergyPanelData panel) {
this(world);
this.setPosition(x, y + panel.heightOffset, z);
this.ownerEntityId = owner.getEntityId();
this.ownerEntityId = owner != null ? owner.getEntityId() : -1;
this.panelYaw = yaw;
this.prevPanelYaw = yaw;
this.mode = mode;
src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java
+1 -1
View File
@@ -184,7 +184,7 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility {
this.startY = y;
this.startZ = z;
this.ownerEntityId = owner.getEntityId();
this.ownerEntityId = owner != null ? owner.getEntityId() : -1;
this.targetEntityId = target != null ? target.getEntityId() : -1;
// Visual
src/main/java/kamkeel/npcs/entity/EntityEnergySweeper.java
+6 -4
View File
@@ -78,7 +78,7 @@ public class EntityEnergySweeper extends EntityEnergyAbility {
boolean lockOnTarget) {
this(world);
this.ownerEntityId = owner.getEntityId();
this.ownerEntityId = owner != null ? owner.getEntityId() : -1;
this.targetEntityId = target != null ? target.getEntityId() : -1;
this.beamLength = beamLength;
this.beamWidth = beamWidth;
@@ -95,16 +95,18 @@ public class EntityEnergySweeper extends EntityEnergyAbility {
this.maxTicks = (int) ((360.0f * numberOfRotations) / sweepSpeed) + 10;
// Calculate base yaw
if (lockOnTarget && target != null) {
if (lockOnTarget && target != null && owner != null) {
double dx = target.posX - owner.posX;
double dz = target.posZ - owner.posZ;
this.baseYaw = (float) Math.toDegrees(Math.atan2(-dx, dz));
} else {
} else if (owner != null) {
this.baseYaw = owner.rotationYaw;
}
// Position at beam center (bottom at feet, top at feet + beamHeight)
this.setPosition(owner.posX, owner.posY + beamHeight / 2.0, owner.posZ);
if (owner != null) {
this.setPosition(owner.posX, owner.posY + beamHeight / 2.0, owner.posZ);
}
// Ready to deal damage immediately
this.ticksSinceDamage = damageInterval;