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

Fixed Uncontrolled Rift Spread

Browse Source 
Switched rifts over to using link.childCount() to track spread instead
of the hasGrownRifts flag in the tile entity. The flag had the flaw that
if the rift was replaced by a block, the flag would reset and the rift
could spread again. I think I remember this being intended as punishment
for messing with rifts but it's a problem when combined with World
Thread farming.
This commit is contained in:
SenseiKiwi
2014-03-12 06:06:45 -04:00
parent 5db2b35850
commit 8d28dc1517
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
View File

@@ -35,11 +35,14 @@ import StevenDimDoors.mod_pocketDim.util.Point4D;
public class TileEntityRift extends TileEntity public class TileEntityRift extends TileEntity
{ {
private static final int MAX_ANCESTOR_LINKS = 3; private static final int MAX_ANCESTOR_LINKS = 2;
private static final int MAX_CHILD_LINKS = 1;
private static final int ENDERMAN_SPAWNING_CHANCE = 1; private static final int ENDERMAN_SPAWNING_CHANCE = 1;
private static final int MAX_ENDERMAN_SPAWNING_CHANCE = 32; private static final int MAX_ENDERMAN_SPAWNING_CHANCE = 32;
private static final int RIFT_SPREAD_CHANCE = 1; private static final int RIFT_SPREAD_CHANCE = 1;
private static final int MAX_RIFT_SPREAD_CHANCE = 256; private static final int MAX_RIFT_SPREAD_CHANCE = 256;
private static final int HOSTILE_ENDERMAN_CHANCE = 1;
private static final int MAX_HOSTILE_ENDERMAN_CHANCE = 3;
private static Random random = new Random(); private static Random random = new Random();
@@ -51,7 +54,6 @@ public class TileEntityRift extends TileEntity
public int zOffset = 0; public int zOffset = 0;
public boolean shouldClose = false; public boolean shouldClose = false;
private boolean hasUpdated = false; private boolean hasUpdated = false;
private boolean hasGrownRifts = false;
public DimLink nearestRiftData; public DimLink nearestRiftData;
public int spawnedEndermenID = 0; public int spawnedEndermenID = 0;
@@ -107,8 +109,6 @@ public class TileEntityRift extends TileEntity
this.calculateOldParticleOffset(); //this also calculates the distance for the particle stuff. this.calculateOldParticleOffset(); //this also calculates the distance for the particle stuff.
} }
updateTimer++; updateTimer++;
} }
@Override @Override
@@ -169,7 +169,7 @@ public class TileEntityRift extends TileEntity
enderman.setLocationAndAngles(xCoord + 0.5, yCoord - 1, zCoord + 0.5, 5, 6); enderman.setLocationAndAngles(xCoord + 0.5, yCoord - 1, zCoord + 0.5, 5, 6);
worldObj.spawnEntityInWorld(enderman); worldObj.spawnEntityInWorld(enderman);
if(this.worldObj.rand.nextInt(3)==0) if (random.nextInt(MAX_HOSTILE_ENDERMAN_CHANCE) < HOSTILE_ENDERMAN_CHANCE)
{ {
EntityPlayer player = this.worldObj.getClosestPlayerToEntity(enderman, 50); EntityPlayer player = this.worldObj.getClosestPlayerToEntity(enderman, 50);
if (player != null) if (player != null)
@@ -318,7 +318,7 @@ public class TileEntityRift extends TileEntity
public void grow(DDProperties properties) public void grow(DDProperties properties)
{ {
if (worldObj.isRemote || hasGrownRifts || !properties.RiftSpreadEnabled if (worldObj.isRemote || !properties.RiftSpreadEnabled
|| random.nextInt(MAX_RIFT_SPREAD_CHANCE) < RIFT_SPREAD_CHANCE || this.shouldClose) || random.nextInt(MAX_RIFT_SPREAD_CHANCE) < RIFT_SPREAD_CHANCE || this.shouldClose)
{ {
return; return;
@@ -327,7 +327,7 @@ public class TileEntityRift extends TileEntity
NewDimData dimension = PocketManager.getDimensionData(worldObj); NewDimData dimension = PocketManager.getDimensionData(worldObj);
DimLink link = dimension.getLink(xCoord, yCoord, zCoord); DimLink link = dimension.getLink(xCoord, yCoord, zCoord);
if (countAncestorLinks(link) > MAX_ANCESTOR_LINKS) if (link.childCount() >= MAX_CHILD_LINKS || countAncestorLinks(link) > MAX_ANCESTOR_LINKS)
{ {
return; return;
} }
@@ -340,8 +340,7 @@ public class TileEntityRift extends TileEntity
{ {
return; return;
} }
mod_pocketDim.blockRift.spreadRift(dimension, link, worldObj, random);
hasGrownRifts = mod_pocketDim.blockRift.spreadRift(dimension, link, worldObj, random);
} }
@Override @Override
@@ -354,7 +353,6 @@ public class TileEntityRift extends TileEntity
this.xOffset = nbt.getInteger("xOffset"); this.xOffset = nbt.getInteger("xOffset");
this.yOffset = nbt.getInteger("yOffset"); this.yOffset = nbt.getInteger("yOffset");
this.zOffset = nbt.getInteger("zOffset"); this.zOffset = nbt.getInteger("zOffset");
this.hasGrownRifts = nbt.getBoolean("grownRifts");
this.age = nbt.getInteger("age"); this.age = nbt.getInteger("age");
this.shouldClose = nbt.getBoolean("shouldClose"); this.shouldClose = nbt.getBoolean("shouldClose");
this.spawnedEndermenID = nbt.getInteger("spawnedEndermenID"); this.spawnedEndermenID = nbt.getInteger("spawnedEndermenID");
@@ -367,7 +365,6 @@ public class TileEntityRift extends TileEntity
nbt.setInteger("age", this.age); nbt.setInteger("age", this.age);
nbt.setInteger("count", this.updateTimer); nbt.setInteger("count", this.updateTimer);
nbt.setInteger("count2", this.riftCloseTimer); nbt.setInteger("count2", this.riftCloseTimer);
nbt.setBoolean("grownRifts",this.hasGrownRifts);
nbt.setInteger("xOffset", this.xOffset); nbt.setInteger("xOffset", this.xOffset);
nbt.setInteger("yOffset", this.yOffset); nbt.setInteger("yOffset", this.yOffset);
nbt.setInteger("zOffset", this.zOffset); nbt.setInteger("zOffset", this.zOffset);