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

Fixed #503 IC2 Classic energy connection leak during jump

Browse source
This commit is contained in:
LemADEC 2022-01-15 19:27:50 +01:00
parent a67fd241fc
commit 94bc54c8e0
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
run/mods-ref/IC2Classic+1.12-1.5.5.2.1.jar Normal file
View file

Binary file not shown.

3
src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
View file

@ -188,6 +188,7 @@ public class WarpDriveConfig {
public static boolean G_ENABLE_FAST_SET_BLOCKSTATE = false; public static boolean G_ENABLE_FAST_SET_BLOCKSTATE = false;
public static boolean G_ENABLE_PROTECTION_CHECKS = true; public static boolean G_ENABLE_PROTECTION_CHECKS = true;
public static boolean G_ENABLE_EXPERIMENTAL_REFRESH = false; public static boolean G_ENABLE_EXPERIMENTAL_REFRESH = false;
public static boolean G_ENABLE_EXPERIMENTAL_UNLOAD = true;
public static int G_MINIMUM_DIMENSION_UNLOAD_QUEUE_DELAY = 100; public static int G_MINIMUM_DIMENSION_UNLOAD_QUEUE_DELAY = 100;
public static boolean G_ENABLE_FORGE_CHUNK_MANAGER = true; public static boolean G_ENABLE_FORGE_CHUNK_MANAGER = true;
@ -861,6 +862,8 @@ public class WarpDriveConfig {
"Enable area protection checks from other mods or plugins, disable if you use the event system exclusively").getBoolean(G_ENABLE_PROTECTION_CHECKS); "Enable area protection checks from other mods or plugins, disable if you use the event system exclusively").getBoolean(G_ENABLE_PROTECTION_CHECKS);
G_ENABLE_EXPERIMENTAL_REFRESH = config.get("general", "enable_experimental_refresh", G_ENABLE_EXPERIMENTAL_REFRESH, G_ENABLE_EXPERIMENTAL_REFRESH = config.get("general", "enable_experimental_refresh", G_ENABLE_EXPERIMENTAL_REFRESH,
"Enable experimental refresh during jump to prevent duping, use at your own risk").getBoolean(G_ENABLE_EXPERIMENTAL_REFRESH); "Enable experimental refresh during jump to prevent duping, use at your own risk").getBoolean(G_ENABLE_EXPERIMENTAL_REFRESH);
G_ENABLE_EXPERIMENTAL_UNLOAD = config.get("general", "enable_experimental_unload", G_ENABLE_EXPERIMENTAL_UNLOAD,
"Enable experimental tile entity unloading during jump to force a cleanup, required for IC2 Classic, may cause issues with other mods").getBoolean(G_ENABLE_EXPERIMENTAL_UNLOAD);
G_MINIMUM_DIMENSION_UNLOAD_QUEUE_DELAY = Commons.clamp(0, 1000, G_MINIMUM_DIMENSION_UNLOAD_QUEUE_DELAY = Commons.clamp(0, 1000,
config.get("general", "minimum_dimension_unload_queue_delay_ticks", G_MINIMUM_DIMENSION_UNLOAD_QUEUE_DELAY, config.get("general", "minimum_dimension_unload_queue_delay_ticks", G_MINIMUM_DIMENSION_UNLOAD_QUEUE_DELAY,
"Enforce a minimum value for Forge's dimensionUnloadQueueDelay to fix various dimension transition issues from unloading the world too soon (set below 100 at your own risk)").getInt()); "Enforce a minimum value for Forge's dimensionUnloadQueueDelay to fix various dimension transition issues from unloading the world too soon (set below 100 at your own risk)").getInt());

10
src/main/java/cr0s/warpdrive/event/JumpSequencer.java
View file

@ -1298,7 +1298,15 @@ public class JumpSequencer extends AbstractSequencer {
WarpDrive.logger.info(String.format("Removing tile entity at (%d %d %d)", WarpDrive.logger.info(String.format("Removing tile entity at (%d %d %d)",
jumpBlock.x, jumpBlock.y, jumpBlock.z)); jumpBlock.x, jumpBlock.y, jumpBlock.z));
} }
worldSource.removeTileEntity(blockPos); if (WarpDriveConfig.G_ENABLE_EXPERIMENTAL_UNLOAD) {
final TileEntity tileEntity = worldSource.getTileEntity(blockPos);
if (tileEntity != null) {
tileEntity.onChunkUnload();
worldSource.removeTileEntity(blockPos);
}
} else {
worldSource.removeTileEntity(blockPos);
}
} }
try { try {
boolean isRemoved = FastSetBlockState.setBlockStateNoLight(worldSource, blockPos, Blocks.AIR.getDefaultState(), 2); boolean isRemoved = FastSetBlockState.setBlockStateNoLight(worldSource, blockPos, Blocks.AIR.getDefaultState(), 2);