Skip to content

Commit aed19d8

Browse files
octylFractaldordsor21
authored andcommitted
[Bukkit] Stop using EnumMap for potential registry types
Biome broke in 1.21.3, Material could break in the future
1 parent 5945240 commit aed19d8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252

5353
import javax.annotation.Nonnull;
5454
import javax.annotation.Nullable;
55-
import java.util.EnumMap;
5655
import java.util.HashMap;
5756
import java.util.Map;
5857
import java.util.Objects;
58+
import java.util.concurrent.ConcurrentHashMap;
5959

6060
import static com.google.common.base.Preconditions.checkNotNull;
6161

@@ -367,6 +367,9 @@ public static GameMode adapt(org.bukkit.GameMode gameMode) {
367367
//FAWE end
368368
}
369369

370+
private static final Map<Biome, BiomeType> biomeBiomeTypeCache = new ConcurrentHashMap<>();
371+
private static final Map<BiomeType, Biome> biomeTypeBiomeCache = new ConcurrentHashMap<>();
372+
370373
/**
371374
* Create a WorldEdit BiomeType from a Bukkit one.
372375
*
@@ -403,8 +406,8 @@ public static org.bukkit.entity.EntityType adapt(EntityType entityType) {
403406
//FAWE end
404407
}
405408

406-
private static final EnumMap<Material, BlockType> materialBlockTypeCache = new EnumMap<>(Material.class);
407-
private static final EnumMap<Material, ItemType> materialItemTypeCache = new EnumMap<>(Material.class);
409+
private static final Map<Material, BlockType> materialBlockTypeCache = new ConcurrentHashMap<>();
410+
private static final Map<Material, ItemType> materialItemTypeCache = new ConcurrentHashMap<>();
408411

409412
/**
410413
* Converts a Material to a BlockType.

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@
2828
import com.sk89q.worldedit.world.registry.BundledBlockRegistry;
2929
import com.sk89q.worldedit.world.registry.PassthroughBlockMaterial;
3030
import org.bukkit.Material;
31-
import org.bukkit.block.data.BlockData;
32-
3331
import javax.annotation.Nullable;
34-
import java.util.ArrayList;
3532
import java.util.Collection;
3633
import java.util.List;
3734
import java.util.Map;

0 commit comments

Comments
 (0)