diff --git a/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkitModern.java b/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkitModern.java index 8969eab6..8868a2b8 100644 --- a/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkitModern.java +++ b/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkitModern.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import org.bukkit.Material; +import org.bukkit.block.data.type.Gate; import fr.neatmonster.nocheatplus.compat.BridgeMaterial; import fr.neatmonster.nocheatplus.compat.blocks.init.BlockInit; @@ -25,6 +26,8 @@ public class MCAccessBukkitModern extends MCAccessBukkit { private static final BukkitShapeModel MODEL_STAIRS= new BukkitStairs(); private static final BukkitShapeModel MODEL_THIN_FENCE = new BukkitFence( 0.1375 + 0.3, 0.8625 - 0.3, 1.0); + private static final BukkitShapeModel MODEL_THICK_FENCE = new BukkitFence( + 0.075 + 0.3, 0.925 - 0.3, 1.5); public MCAccessBukkitModern() { super(); @@ -76,8 +79,16 @@ public class MCAccessBukkitModern extends MCAccessBukkit { processedBlocks.add(mat); shapeModels.put(mat, MODEL_STAIRS); } - // Fences. // TODO: May need specialized models for edge cases? - // Thin fences. + // Fences, cobblestone wall. + if (BlockFlags.hasAnyFlag(flags, BlockProperties.F_THICK_FENCE)) { + if (BlockFlags.hasAnyFlag(flags, BlockProperties.F_PASSABLE_X4)) { + // TODO: Perhaps another model flag. + } + else { + processedBlocks.add(mat); + shapeModels.put(mat, MODEL_THICK_FENCE); + } + } // ... (heads, chests, static, shulker box ...) } diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java index 2f8681f4..897ed301 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java @@ -1170,7 +1170,8 @@ public class BlockProperties { } for (final Material mat : MaterialUtil.WOODEN_FENCES) { setFlag(mat, flags150); - }for (final Material mat : MaterialUtil.WOODEN_FENCE_GATES) { + } + for (final Material mat : MaterialUtil.WOODEN_FENCE_GATES) { setFlag(mat, flags150); }