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

Optimize bedrock detection

Browse source
This commit is contained in:
Disasm 2013-07-11 00:37:36 +04:00
parent ee40e765ae
commit 7c1817ebca
1 changed files with 12 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/cr0s/WarpDrive/EntityJump.java
View file

@ -49,6 +49,7 @@ public class EntityJump extends Entity {
public int blowX, blowY, blowZ;
boolean needToExplode = false;
public boolean on = false;
public boolean bedrockOnShip = false;
public JumpBlock ship[];
public TileEntityReactor reactor;
@ -305,13 +306,15 @@ public class EntityJump extends Entity {
return;
}
if (!checkForBedrockOnShip()) {
killEntity("Is bedrock on the ship. Aborting.");
messageToAllPlayersOnShip("Is bedrock on the ship. Aborting.");
bedrockOnShip = false;
int shipSize = getRealShipSize(); // sets bedrockOnShip
if (bedrockOnShip) {
killEntity("Bedrock is on the ship. Aborting.");
messageToAllPlayersOnShip("Bedrock is on the ship. Aborting.");
return;
}
int shipSize = getRealShipSize();
saveShip(shipSize);
setBlocksUnderPlayers(false);
@ -438,30 +441,6 @@ public class EntityJump extends Entity {
return testDistance;
}
/**
* Check for frobidden blocks on ship (bedrock)
*
*/
public boolean checkForBedrockOnShip() {
for (int y = minY; y <= maxY; y++) {
for (int x = Xmin; x <= Xmax; x++) {
for (int z = Zmin; z <= Zmax; z++) {
int blockID = worldObj.getBlockId(x, y, z);
if (blockID == 0) {
continue;
}
if (blockID == Block.bedrock.blockID) {
return false;
}
}
}
}
return true;
}
/*
* Получить реальное количество блоков, из которых состоит корабль
*/
@ -477,6 +456,11 @@ public class EntityJump extends Entity {
if (blockID != 0) {
shipSize++;
}
if (blockID == Block.bedrock.blockID) {
bedrockOnShip = true;
return shipSize;
}
}
}
}