From e08fda0ac2719c11a60965ee38c44d1382aad8b5 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Thu, 17 Dec 2020 22:06:32 +0000 Subject: [PATCH] cache the correct number of blocks for FAWE fixes #747 --- .../worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_15_R2.java | 2 +- .../worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java | 2 +- .../worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R2.java | 2 +- .../worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R3.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_15_R2.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_15_R2.java index 58e86eb92..aa63a5b2d 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_15_R2.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_15_R2.java @@ -124,7 +124,7 @@ public final class FAWE_Spigot_v1_15_R2 extends CachedBukkitAdapter implements I if (ibdToStateOrdinal != null && ibdToStateOrdinal[1] != 0) { return false; } - ibdToStateOrdinal = new char[Block.REGISTRY_ID.a()]; // size + ibdToStateOrdinal = new char[BlockTypesCache.states.length]; // size for (int i = 0; i < ibdToStateOrdinal.length; i++) { BlockState state = BlockTypesCache.states[i]; BlockMaterial_1_15_2 material = (BlockMaterial_1_15_2) state.getMaterial(); diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java index cd3625917..1ab34aabf 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R1.java @@ -123,7 +123,7 @@ public final class FAWE_Spigot_v1_16_R1 extends CachedBukkitAdapter implements I if (ibdToStateOrdinal != null && ibdToStateOrdinal[1] != 0) { return false; } - ibdToStateOrdinal = new char[Block.REGISTRY_ID.a()]; // size + ibdToStateOrdinal = new char[BlockTypesCache.states.length]; // size for (int i = 0; i < ibdToStateOrdinal.length; i++) { BlockState state = BlockTypesCache.states[i]; BlockMaterial_1_16_1 material = (BlockMaterial_1_16_1) state.getMaterial(); diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R2.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R2.java index 966831373..3c9d4b680 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R2.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R2.java @@ -124,7 +124,7 @@ public final class FAWE_Spigot_v1_16_R2 extends CachedBukkitAdapter implements I if (ibdToStateOrdinal != null && ibdToStateOrdinal[1] != 0) { return false; } - ibdToStateOrdinal = new char[Block.REGISTRY_ID.a()]; // size + ibdToStateOrdinal = new char[BlockTypesCache.states.length]; // size for (int i = 0; i < ibdToStateOrdinal.length; i++) { BlockState state = BlockTypesCache.states[i]; BlockMaterial_1_16_2 material = (BlockMaterial_1_16_2) state.getMaterial(); diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R3.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R3.java index 79fc3499b..9abe6a038 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R3.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R3.java @@ -125,7 +125,7 @@ public final class FAWE_Spigot_v1_16_R3 extends CachedBukkitAdapter implements I if (ibdToStateOrdinal != null && ibdToStateOrdinal[1] != 0) { return false; } - ibdToStateOrdinal = new char[Block.REGISTRY_ID.a()]; // size + ibdToStateOrdinal = new char[BlockTypesCache.states.length]; // size for (int i = 0; i < ibdToStateOrdinal.length; i++) { BlockState state = BlockTypesCache.states[i]; BlockMaterial_1_16_4 material = (BlockMaterial_1_16_4) state.getMaterial();