diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-29 11:57:53 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2015-12-29 11:57:53 +0100 |
| commit | 177adcbf32a8e5d9ddcb68be18156d66bd34f505 (patch) | |
| tree | 8d80405841d5e411f85e95aa70bdf9a63d945e8c /src | |
| parent | f0d84541236a26d0c0c1bb62e9d657b534ef6eab (diff) | |
| download | GT5-Unofficial-177adcbf32a8e5d9ddcb68be18156d66bd34f505.tar.gz GT5-Unofficial-177adcbf32a8e5d9ddcb68be18156d66bd34f505.tar.bz2 GT5-Unofficial-177adcbf32a8e5d9ddcb68be18156d66bd34f505.zip | |
Revert "Fixed world event lag and related cauldron crash"
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 8aa817a57c..ddd2179478 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1421,20 +1421,20 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } } if ((aEvent.world.getTotalWorldTime() % 100L == 0L) && ((this.mItemDespawnTime != 6000) || (this.mMaxEqualEntitiesAtOneSpot > 0))) { - for (Object object : aEvent.world.loadedEntityList) { - if (object instanceof Entity) { - Entity tEntity = (Entity) object; - if ((tEntity instanceof EntityItem) && (this.mItemDespawnTime != 6000) && (((EntityItem) tEntity).lifespan == 6000)) { + for (int i = 0; i < aEvent.world.loadedEntityList.size(); i++) { + if ((aEvent.world.loadedEntityList.get(i) instanceof Entity)) { + Entity tEntity = (Entity) aEvent.world.loadedEntityList.get(i); + if (((tEntity instanceof EntityItem)) && (this.mItemDespawnTime != 6000) && (((EntityItem) tEntity).lifespan == 6000)) { ((EntityItem) tEntity).lifespan = this.mItemDespawnTime; - } else if ((tEntity instanceof EntityLivingBase) && (this.mMaxEqualEntitiesAtOneSpot > 0) && (!(tEntity instanceof EntityPlayer)) + } else if (((tEntity instanceof EntityLivingBase)) && (this.mMaxEqualEntitiesAtOneSpot > 0) && (!(tEntity instanceof EntityPlayer)) && (((EntityLivingBase) tEntity).canBePushed()) && (((EntityLivingBase) tEntity).getHealth() > 0.0F)) { - List<Entity> tList = tEntity.worldObj.getEntitiesWithinAABBExcludingEntity(tEntity, + List tList = tEntity.worldObj.getEntitiesWithinAABBExcludingEntity(tEntity, tEntity.boundingBox.expand(0.20000000298023224D, 0.0D, 0.20000000298023224D)); Class tClass = tEntity.getClass(); int tEntityCount = 1; if (tList != null) { - for (Entity nearbyEntity : tList) { - if ((nearbyEntity != null) && (nearbyEntity.getClass() == tClass)) { + for (int j = 0; j < tList.size(); j++) { + if ((tList.get(j) != null) && (tList.get(j).getClass() == tClass)) { tEntityCount++; } } |