Skip to content

Commit 0a0c978

Browse files
Fix tree punch time. Fix random startup crash. Other minor fix.
1 parent bff19ad commit 0a0c978

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/main/java/com/ferreusveritas/dynamictrees/api/TreeHelper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ public static void ageVolume(LevelAccessor level, SimpleVoxmap leafMap, int iter
6363

6464
//The iterMap is the voxmap we will use as a discardable. The leafMap must survive for snow
6565
SimpleVoxmap iterMap = leafMap != null ? new SimpleVoxmap(leafMap) : null;
66-
Iterable<BlockPos.MutableBlockPos> iterable = iterMap.getAllNonZero();
6766

6867
for (int i = 0; i < iterations; i++) {
69-
for (BlockPos.MutableBlockPos iPos : iterable) {
68+
for (BlockPos.MutableBlockPos iPos : iterMap.getAllNonZero()) {
7069
BlockState blockState = level.getBlockState(iPos);
7170
Block block = blockState.getBlock();
7271
if (block instanceof DynamicLeavesBlock) {//Special case for leaves

src/main/java/com/ferreusveritas/dynamictrees/api/resource/ResourceCollector.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import com.google.common.collect.Maps;
44
import net.minecraft.resources.ResourceLocation;
55

6-
import java.util.concurrent.ConcurrentSkipListMap;
6+
import java.util.Collections;
7+
import java.util.LinkedHashMap;
78
import java.util.function.Supplier;
89

910
/**
@@ -20,11 +21,11 @@ public interface ResourceCollector<R> {
2021
void clear();
2122

2223
static <R> ResourceCollector<R> unordered() {
23-
return new SimpleResourceCollector<>(Maps::newHashMap);
24+
return new SimpleResourceCollector<>(Maps::newConcurrentMap);
2425
}
2526

2627
static <R> ResourceCollector<R> ordered() {
27-
return new SimpleResourceCollector<>(Maps::newLinkedHashMap);
28+
return new SimpleResourceCollector<>(() -> Collections.synchronizedMap(new LinkedHashMap<>()));
2829
}
2930

3031
}

src/main/java/com/ferreusveritas/dynamictrees/tree/family/Family.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ public SoundType getDefaultBranchSoundType() {
594594

595595
public BlockBehaviour.Properties getDefaultBranchProperties(MapColor mapColor) {
596596
BlockBehaviour.Properties properties = BlockBehaviour.Properties.of().sound(this.getDefaultBranchSoundType()).mapColor(mapColor)
597-
.noLootTable().requiresCorrectToolForDrops();
597+
.noLootTable();
598598
if (!this.isFireProof())
599599
properties.ignitedByLava();
600600
return properties;

0 commit comments

Comments
 (0)