Merge pull request #440 from gamerforEA/master

Fix BlockType and ItemType registration for Sponge distributive
This commit is contained in:
Matthew Miller 2018-12-25 21:08:07 +10:00 committed by GitHub
commit 976a92d5ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -139,11 +139,17 @@ public class SpongeWorldEdit {
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);