Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #94 (to be tested)

Browse source
This commit is contained in:
LemADEC 2016-01-25 04:02:57 +01:00
parent a866a23dc0
commit 98a5a7c249
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/cr0s/warpdrive/data/CloakManager.java
View file

@ -81,22 +81,22 @@ public class CloakManager {
return false;
}
public boolean isAreaExists(World worldObj, int x, int y, int z) {
return (getCloakedArea(worldObj, x, y, z) != null);
public boolean isAreaExists(World world, int x, int y, int z) {
return (getCloakedArea(world, x, y, z) != null);
}
public void updateCloakedArea(
World worldObj,
World world,
final int dimensionId, final int coreX, final int coreY, final int coreZ, final byte tier,
final int minX, final int minY, final int minZ,
final int maxX, final int maxY, final int maxZ) {
CloakedArea newArea = new CloakedArea(worldObj, dimensionId, coreX, coreY, coreZ, tier, minX, minY, minZ, maxX, maxY, maxZ);
CloakedArea newArea = new CloakedArea(world, dimensionId, coreX, coreY, coreZ, tier, minX, minY, minZ, maxX, maxY, maxZ);
// find existing one
int index = -1;
for (int i = 0; i < cloaks.size(); i++) {
CloakedArea area = cloaks.get(i);
if ( area.dimensionId == worldObj.provider.dimensionId
if ( area.dimensionId == world.provider.dimensionId
&& area.coreX == coreX
&& area.coreY == coreY
&& area.coreZ == coreZ ) {
@ -109,7 +109,7 @@ public class CloakManager {
} else {
cloaks.add(newArea);
}
if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
if (world.isRemote) {
newArea.clientCloak();
}
if (WarpDriveConfig.LOGGING_CLOAKING) { WarpDrive.logger.info("Cloak count is " + cloaks.size()); }
@ -138,9 +138,9 @@ public class CloakManager {
}
}
public CloakedArea getCloakedArea(World worldObj, int x, int y, int z) {
public CloakedArea getCloakedArea(World world, int x, int y, int z) {
for (CloakedArea area : cloaks) {
if (area.dimensionId == worldObj.provider.dimensionId && area.coreX == x && area.coreY == y && area.coreZ == z)
if (area.dimensionId == world.provider.dimensionId && area.coreX == x && area.coreY == y && area.coreZ == z)
return area;
}

2
src/main/java/cr0s/warpdrive/data/CloakedArea.java
View file

@ -182,7 +182,7 @@ public class CloakedArea {
for (int x = minX; x <= maxX; x++) {
for (int z = minZ; z <= maxZ; z++) {
for (int y = minYclamped; y <= maxYclamped; y++) {
if (!player.worldObj.getBlock(x, y, z).isAssociatedBlock(Blocks.air)) {
if (player.worldObj.getBlock(x, y, z) != Blocks.air) {
player.worldObj.markBlockForUpdate(x, y, z);
JumpBlock.refreshBlockStateOnClient(player.worldObj, x, y, z);

12
src/main/java/cr0s/warpdrive/world/EntitySphereGen.java
View file

@ -90,7 +90,17 @@ public final class EntitySphereGen extends Entity {
public void killEntity() {
this.state = STATE_STOP;
worldObj.markBlockRangeForRenderUpdate(xCoord - radius, yCoord - radius, zCoord - radius, xCoord + radius, yCoord + radius, zCoord + radius);
int minYclamped = Math.max(0, yCoord - radius);
int maxYclamped = Math.min(255, yCoord + radius);
for (int x = xCoord - radius; x <= xCoord + radius; x++) {
for (int z = zCoord - radius; z <= zCoord + radius; z++) {
for (int y = minYclamped; y <= maxYclamped; y++) {
if (worldObj.getBlock(x, y, z) != Blocks.air) {
worldObj.markBlockForUpdate(x, y, z);
}
}
}
}
worldObj.removeEntity(this);
}