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

Fixed accelerator rebooting on chunk loading

Browse source
This commit is contained in:
Unknown 2019-12-10 17:02:27 +01:00 committed by unknown
parent df6ddb553f
commit 4c380f7a59
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/cr0s/warpdrive/block/atomic/TileEntityAcceleratorCore.java
View file

@ -834,6 +834,7 @@ public class TileEntityAcceleratorCore extends TileEntityAbstractEnergyCoreOrCon
protected boolean doScanAssembly(final boolean isDirty, final WarpDriveText textReason) {
final boolean isValid = super.doScanAssembly(isDirty, textReason);
// note: acceleratorSetup is null when loading chunk, always defined otherwise
final AcceleratorSetup legacy_acceleratorSetup = acceleratorSetup;
if ( isDirty
|| acceleratorSetup == null
@ -857,11 +858,12 @@ public class TileEntityAcceleratorCore extends TileEntityAbstractEnergyCoreOrCon
// reset accelerator in case of major changes
if (isDirty) {
if (acceleratorSetup.isMajorChange(legacy_acceleratorSetup)) {
if ( legacy_acceleratorSetup != null
&& acceleratorSetup.isMajorChange(legacy_acceleratorSetup) ) {
if (WarpDriveConfig.LOGGING_ACCELERATOR) {
WarpDrive.logger.info(this + " rebooting due to major change...");
}
rebootAccelerator(legacy_acceleratorSetup != null ? legacy_acceleratorSetup : acceleratorSetup, true, true);
rebootAccelerator(legacy_acceleratorSetup, true, true);
}
sendEvent("acceleratorUpdated");
}