Fix BlockType and ItemType registration for Sponge distributive

EngineHub · Dec 24, 2018 · 66415df · 66415df
1 parent 2e62389
commit 66415df
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java
@@ -139,11 +139,17 @@ public void serverAboutToStart(GameAboutToStartServerEvent event) {
 
         for (BlockType blockType : Sponge.getRegistry().getAllOf(BlockType.class)) {
             // TODO Handle blockstate stuff
-            com.sk89q.worldedit.world.block.BlockTypes.register(new com.sk89q.worldedit.world.block.BlockType(blockType.getId()));
+            String id = blockType.getId();
+            if (!com.sk89q.worldedit.world.block.BlockType.REGISTRY.keySet().contains(id)) {
+                com.sk89q.worldedit.world.block.BlockTypes.register(new com.sk89q.worldedit.world.block.BlockType(id));
+            }
         }
 
         for (ItemType itemType : Sponge.getRegistry().getAllOf(ItemType.class)) {
-            ItemTypes.register(new com.sk89q.worldedit.world.item.ItemType(itemType.getId()));
+            String id = itemType.getId();
+            if (!com.sk89q.worldedit.world.item.ItemType.REGISTRY.keySet().contains(id)) {
+                ItemTypes.register(new com.sk89q.worldedit.world.item.ItemType(id));
+            }
         }
 
         WorldEdit.getInstance().getPlatformManager().register(platform);