R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-03-21 09:45:53 -04:00
commit b2a8b7dc97
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/embeddedt/modernfix/blockstate/BlockStateCacheHandler.java
View File

@ -26,7 +26,7 @@ public class BlockStateCacheHandler {
} }
public static void rebuildParallel(boolean force) { public static void rebuildParallel(boolean force) {
synchronized (BlockBehaviour.BlockStateBase.Cache.class) { synchronized (BlockBehaviour.BlockStateBase.class) {
for (BlockState blockState : Block.BLOCK_STATE_REGISTRY) { for (BlockState blockState : Block.BLOCK_STATE_REGISTRY) {
((IBlockState)blockState).clearCache(); ((IBlockState)blockState).clearCache();
} }

2
src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java
View File

@ -37,7 +37,7 @@ public abstract class BlockStateBaseMixin implements IBlockState {
private BlockBehaviour.BlockStateBase.Cache initCacheIfNeeded(BlockBehaviour.BlockStateBase base) { private BlockBehaviour.BlockStateBase.Cache initCacheIfNeeded(BlockBehaviour.BlockStateBase base) {
if(cacheInvalid) { if(cacheInvalid) {
// Ensure that only one block's cache is built at a time // Ensure that only one block's cache is built at a time
synchronized (BlockBehaviour.BlockStateBase.Cache.class) { synchronized (BlockBehaviour.BlockStateBase.class) {
if(cacheInvalid) { if(cacheInvalid) {
// Ensure that if we end up in here recursively, we just use the original cache // Ensure that if we end up in here recursively, we just use the original cache
if(!buildingCache) { if(!buildingCache) {