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

Oops.

This commit is contained in:
asofold 2018-08-23 23:59:49 +02:00
parent 982fda081a
commit 1868fb587a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/BlocksMC1_13.java
View File

@ -80,7 +80,7 @@ public class BlocksMC1_13 implements BlockPropertiesSetup {
// Stone types.
for (Material mat : BridgeMaterial.getAllBlocks("andesite", "diorite", "granite",
"polished_andesite", "polished_diorite", "polished_granite",
"smooth_stone", "nether_wart", "nether_warts")) {
"smooth_stone")) {
BlockInit.setAs(mat, Material.STONE);
}

7
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/MaterialUtil.java
View File

@ -449,10 +449,9 @@ public class MaterialUtil {
Arrays.asList("coral_fan", "coral_wall_fan", "coral"),
AlmostBoolean.YES, "dead", "legacy"),
BridgeMaterial.getAllBlocks("attached_melon_stem", "attached_pumpkin_stem",
"allium", "dandelion",
"dandelion_yellow", "fern", "kelp", "kelp_plant",
"large_fern", "lilac", "melon_stem", "oxeye_daisy",
"peony", "poppy", "red_rose", "rose_red", "seagrass",
"allium", "dandelion", "dandelion_yellow", "fern", "kelp", "kelp_plant",
"large_fern", "lilac", "melon_stem", "nether_wart", "nether_warts",
"oxeye_daisy", "peony", "poppy", "red_rose", "rose_red", "seagrass",
"sunflower", "tall_seagrass"
// TODO: Ground or not: "beetroots", "beetroot_block"
),