apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on exiting personal pocket dimension #185

Closed
notabadminer wants to merge 67 commits from master into master
pull from: master
merge into: apex:master
Conversation 1 Commits 67 Files Changed 366 +14 -14
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e15bfbd2d1 - Show all commits

28
src/main/java/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
View File

@@ -131,7 +131,7 @@ public class MobMonolith extends EntityFlying implements IMob
public void onEntityUpdate() public void onEntityUpdate()
{ {
// Remove this Monolith if it's not in Limbo or in a pocket dimension // Remove this Monolith if it's not in Limbo or in a pocket dimension
if (!(this.worldObj.provider instanceof LimboProvider || this.worldObj.provider instanceof PocketProvider)) if (!(this.worldObj.provider.dimensionId == properties.LimboDimensionID|| this.worldObj.provider instanceof PocketProvider))
{ {
this.setDead(); this.setDead();
super.onEntityUpdate(); super.onEntityUpdate();
@@ -191,12 +191,12 @@ public class MobMonolith extends EntityFlying implements IMob
// Rapidly increase the aggro level if this Monolith can see the player // Rapidly increase the aggro level if this Monolith can see the player
if (visibility) if (visibility)
{ {
if (this.worldObj.provider instanceof LimboProvider) if (this.worldObj.provider.dimensionId == properties.LimboDimensionID)
{ {
if (isDangerous()) if (isDangerous())
aggro++; aggro++;
else else
aggro += 18; aggro += 36;
} }
else else
{ {
@@ -206,16 +206,16 @@ public class MobMonolith extends EntityFlying implements IMob
} }
else else
{ {
if (aggro > aggroCap) if (isDangerous()) {
{ if (aggro > aggroCap) {
// Decrease aggro over time // Decrease aggro over time
aggro--; aggro--;
} } else if (player != null && (aggro < aggroCap)) {
else if (player != null && (aggro < aggroCap)) // Increase aggro if a player is within range and aggro < aggroCap
{ aggro++;
// Increase aggro if a player is within range and aggro < aggroCap }
aggro++; } else
} aggro -= 3;
} }
// Clamp the aggro level // Clamp the aggro level
int maxAggro = isDangerous()?MAX_AGGRO:180; int maxAggro = isDangerous()?MAX_AGGRO:180;
@@ -244,7 +244,7 @@ public class MobMonolith extends EntityFlying implements IMob
float aggroPercent = this.getAggroProgress(); float aggroPercent = this.getAggroProgress();
if (this.soundTime <= 0) if (this.soundTime <= 0)
{ {
this.playSound(mod_pocketDim.modid + ":monk", 1F, 1F); this.playSound(mod_pocketDim.modid + ":monk", 1F, 1F);
this.soundTime = 100; this.soundTime = 100;
} }
if ((aggroPercent > 0.70) && this.soundTime < 100) if ((aggroPercent > 0.70) && this.soundTime < 100)