Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fences / coblestone wall.

This commit is contained in:
asofold 2018-08-22 22:38:28 +02:00
parent 4a7fd059dd
commit c4423de353
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/MCAccessBukkitModern.java
View File

@ -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 ...)
}

3
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java
View File

@ -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);
}