Skip to content

Commit 5d5d578

Browse files
committed
Probably fixed one part of the FastUtils Issue Hodgepodge introduced
1 parent f8f4723 commit 5d5d578

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
66

77

88
6.17.07: (Not released yet)
9+
[FIXED] Some World Loading Issue that HodgePodge introduced with FastUtils. If you use Libraries like this to replace stuff, make sure they actually work the same on the outside...
910
[CHANGED] Crucibles are now 100 times harder to break when not empty.
1011
[CHANGED] Rubber-Tree-Resin-Holes will now always spawn, if there is no other loaded Rubber-Tree-Resin-Holes within 256 Blocks.
1112
[CHANGED] Slightly more than doubled Bio Diesel Fuel Value and added Mixer Recipe to obtain it.

src/main/java/gregapi/GT_API_Proxy.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2025 GregTech-6 Team
2+
* Copyright (c) 2026 GregTech-6 Team
33
*
44
* This file is part of GregTech.
55
*
@@ -918,14 +918,17 @@ public void onPlayerTickEvent(PlayerTickEvent aEvent) {
918918
@SubscribeEvent(priority = EventPriority.LOWEST)
919919
public void onChunkWatchEvent(ChunkWatchEvent.Watch aEvent) {
920920
Chunk tChunk = aEvent.player.worldObj.getChunkFromChunkCoords(aEvent.chunk.chunkXPos, aEvent.chunk.chunkZPos);
921-
if (tChunk != null && tChunk.isTerrainPopulated) {
921+
if (tChunk != null && tChunk.isTerrainPopulated && tChunk.chunkTileEntityMap != null && tChunk.chunkTileEntityMap.size() > 0) {
922922
byte tIterations = 8;
923923
HashSetNoNulls<Object> tSet = new HashSetNoNulls<>();
924924
while (tIterations-->0) try {
925925
for (Object tTileEntity : tChunk.chunkTileEntityMap.values()) if (tTileEntity instanceof ITileEntitySynchronising) if (tSet.add(tTileEntity)) ((ITileEntitySynchronising)tTileEntity).sendUpdateToPlayer(aEvent.player);
926926
tIterations = 0;
927927
} catch(ConcurrentModificationException e) {
928928
if (tIterations <= 0) ERR.println("Failed to Iterate 8 times. Giving up on sending Data to Client!");
929+
} catch(Throwable e) {
930+
// FastUtils throws a NullPointer instead of a CME...
931+
if (tIterations <= 0) e.printStackTrace(ERR);
929932
}
930933
}
931934
}

0 commit comments

Comments
 (0)