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

Fixed stabilize LUA return values inconsistency

Browse source 
Added reactor protection for frozen chunks
This commit is contained in:
Unknown 2019-02-27 22:42:02 +01:00 • committed by unknown
parent 240a8b0aaf
commit 949a0ef630
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorCore.java
View file

@ -222,7 +222,11 @@ public class TileEntityEnanReactorCore extends TileEntityEnanReactorController {
if (instabilityValues[reactorFace.indexStability] > instabilityTarget) { if (instabilityValues[reactorFace.indexStability] > instabilityTarget) {
final TileEntityEnanReactorLaser tileEntityEnanReactorLaser = getLaser(reactorFace); final TileEntityEnanReactorLaser tileEntityEnanReactorLaser = getLaser(reactorFace);
if (tileEntityEnanReactorLaser != null) { if (tileEntityEnanReactorLaser != null) {
tileEntityEnanReactorLaser.stabilize(stabilizerEnergy); if (tileEntityEnanReactorLaser.stabilize(stabilizerEnergy) == -stabilizerEnergy) {
// chunk isn't updating properly => protect the reactor
instabilityValues[reactorFace.indexStability] = instabilityTarget;
hold = true;
}
} }
} }
} }

37
src/main/java/cr0s/warpdrive/block/energy/TileEntityEnanReactorLaser.java
View file

@ -154,17 +154,21 @@ public class TileEntityEnanReactorLaser extends TileEntityAbstractLaser implemen
} }
} }
boolean stabilize(final int energy) { protected int stabilize(final int energy) {
if (energy <= 0) { if (energy <= 0) {
return false; return 0;
} }
if (laserMedium_direction == null) { if (laserMedium_direction == null) {
return false; return 0;
}
if (energyStabilizationRequest > 0) {
WarpDrive.logger.warn("%s Stabilization already requested for %s",
this, energy);
return -energy;
} }
energyStabilizationRequest = energy; energyStabilizationRequest = energy;
return true; return energy;
} }
private void doStabilize(final int energy) { private void doStabilize(final int energy) {
@ -229,20 +233,19 @@ public class TileEntityEnanReactorLaser extends TileEntityAbstractLaser implemen
@Override @Override
public Object[] stabilize(final Object[] arguments) { public Object[] stabilize(final Object[] arguments) {
if (arguments.length != 1) { if (arguments.length == 1) {
return new Object[] { false, "Invalid number of arguments" }; final int energy;
} try {
final int energy; energy = Commons.toInt(arguments[0]);
try { return new Object[] { stabilize(energy) };
energy = Commons.toInt(arguments[0]); } catch (final Exception exception) {
} catch (final Exception exception) { if (WarpDriveConfig.LOGGING_LUA) {
if (WarpDriveConfig.LOGGING_LUA) { WarpDrive.logger.error(String.format("%s LUA error on stabilize(): Integer expected for 1st argument %s",
WarpDrive.logger.error(String.format("%s LUA error on stabilize(): Integer expected for 1st argument %s", this, arguments[0]));
this, arguments[0])); }
} }
return new Object[] { false, "Invalid integer" };
} }
return new Object[] { stabilize(energy) }; return new Object[] { energyStabilizationRequest };
} }
@Override @Override