From fb8389bece60bb409df779d37ac2d42072d3d507 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Tue, 8 Dec 2020 19:49:07 +0100 Subject: [PATCH] Requested allowed changes Signed-off-by: Lixfel --- .../de/steamwar/schematicsystem/CheckSchemType_12.java | 3 +++ .../de/steamwar/schematicsystem/CheckSchemType_15.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java b/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java index 1c0b442..45d198a 100644 --- a/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java +++ b/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java @@ -82,6 +82,9 @@ class CheckSchemType_12 { flowers.add(Material.YELLOW_FLOWER); flowers.add(Material.RED_ROSE); flowers.add(Material.DOUBLE_PLANT); + flowers.add(Material.DIAMOND_BARDING); + flowers.add(Material.IRON_BARDING); + flowers.add(Material.GOLD_BARDING); FLOWERS = flowers; } diff --git a/SchematicSystem_15/src/de/steamwar/schematicsystem/CheckSchemType_15.java b/SchematicSystem_15/src/de/steamwar/schematicsystem/CheckSchemType_15.java index 0319734..dbfe37a 100644 --- a/SchematicSystem_15/src/de/steamwar/schematicsystem/CheckSchemType_15.java +++ b/SchematicSystem_15/src/de/steamwar/schematicsystem/CheckSchemType_15.java @@ -83,7 +83,11 @@ class CheckSchemType_15 { Material.CORNFLOWER, Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, - Material.SUNFLOWER); + Material.SUNFLOWER, + Material.DIAMOND_HORSE_ARMOR, + Material.IRON_HORSE_ARMOR, + Material.GOLDEN_HORSE_ARMOR, + Material.HONEY_BOTTLE); private CheckSchemType_15(){} @@ -177,7 +181,7 @@ class CheckSchemType_15 { if(blockMaterial == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW))) counter += item.getByte("Count"); - else if(!FLOWERS.contains(itemType) && !(blockMaterial == Material.CHEST && itemType.equals(Material.TNT))) + else if(!FLOWERS.contains(itemType) && !((blockMaterial == Material.CHEST || blockMaterial == Material.BARREL) && itemType.equals(Material.TNT))) result.foundForbiddenItem(blockMaterial.name(), itemType.name(), item.getByte("Count")); else if(item.containsKey("tag")) result.foundItemWithTag(blockMaterial.name(), itemType.name(), item.getByte("Count"));