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

Fix NPE in AnimationData when world object is missing

Browse Source
This commit is contained in:
Kam committed 2025-06-30 21:58:45 -04:00
1 parent a0775be65c
commit ba28f62d74
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/controllers/data/AnimationData.java
+5 -5
View File
@@ -45,7 +45,7 @@ public class AnimationData implements IAnimationData {
}
public static AnimationData getData(Entity entity) {
if (entity == null) {
if (entity == null || entity.worldObj == null) {
return null;
}
if (entity.worldObj.isRemote) {
@@ -88,7 +88,7 @@ public class AnimationData implements IAnimationData {
public void updateClient(EntityPlayer... excludedPlayers) {
EntityLivingBase sendingEntity = parent instanceof PlayerData ? ((PlayerData) parent).player : parent instanceof DataDisplay ? ((DataDisplay) parent).npc : null;
float range = parent instanceof PlayerData ? 160 : 60;
if (sendingEntity != null) {
if (sendingEntity != null && sendingEntity.worldObj != null) {
if (sendingEntity.dimension != sendingEntity.worldObj.provider.dimensionId)
sendingEntity.dimension = sendingEntity.worldObj.provider.dimensionId;
@@ -235,7 +235,7 @@ public class AnimationData implements IAnimationData {
public void readFromNBT(NBTTagCompound compound) {
Entity entity = this.getMCEntity();
boolean isServer = entity != null && !entity.worldObj.isRemote;
boolean isServer = entity != null && entity.worldObj != null && !entity.worldObj.isRemote;
if (compound.hasKey("IsClientAnimating") && isServer) {
this.isClientAnimating = compound.getBoolean("IsClientAnimating");
if (this.isClientAnimating) {
@@ -272,14 +272,14 @@ public class AnimationData implements IAnimationData {
}
if (this.getMCEntity() != null && this.getMCEntity().worldObj.isRemote && newAnim != null) {
if (this.getMCEntity() != null && this.getMCEntity().worldObj != null && this.getMCEntity().worldObj.isRemote && newAnim != null) {
this.animatingTime = 0;
}
Animation prevAnim = this.animation;
this.animation = newAnim;
if (this.getMCEntity() != null && this.getMCEntity().worldObj.isRemote &&
if (this.getMCEntity() != null && this.getMCEntity().worldObj != null && this.getMCEntity().worldObj.isRemote &&
this.isActive() && prevAnim != null && newAnim != null && !newAnim.frames.isEmpty()) {
Frame frame = (Frame) prevAnim.currentFrame();
if (frame != null) {