From 536eed282328eab0144c73a6c9c4e28f78c6d447 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Tue, 10 Dec 2019 18:38:00 +0100 Subject: [PATCH] Adding check for obsidian and bedrock (for replacement in arena) --- .../src/de/steamwar/schematicsystem/CheckSchemType_12.java | 6 ++++-- .../src/de/steamwar/schematicsystem/CheckSchemType_14.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java b/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java index f3a0cec..6fba870 100644 --- a/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java +++ b/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java @@ -19,6 +19,8 @@ import java.util.logging.Level; class CheckSchemType_12 { private static final int TNT = Material.TNT.getId(); private static final int SLIME = Material.SLIME_BLOCK.getId(); + private static final int OBSIDIAN = Material.OBSIDIAN.getId(); + private static final int BEDROCK = Material.BEDROCK.getId(); private static final int DISPENSER = Material.DISPENSER.getId(); private static final int JUKEBOX = Material.JUKEBOX.getId(); private static final int CHEST = Material.CHEST.getId(); @@ -96,10 +98,10 @@ class CheckSchemType_12 { final BaseBlock block = clipboard.getBlock(new Vector(x, y, z)); final int blockId = block.getId(); - if(blockId == TNT) + if(blockId == TNT || blockId == OBSIDIAN) tnt++; - if(blockId == SLIME) + if(blockId == SLIME || blockId == BEDROCK) slime++; if(blockId == DISPENSER) diff --git a/SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_14.java b/SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_14.java index ca0012b..b778591 100644 --- a/SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_14.java +++ b/SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_14.java @@ -82,10 +82,10 @@ class CheckSchemType_14 { final BaseBlock block = clipboard.getFullBlock(BlockVector3.at(x, y, z)); final Material blockMaterial = Material.matchMaterial(block.getBlockType().getId()); - if(blockMaterial == Material.TNT) + if(blockMaterial == Material.TNT || blockMaterial == Material.OBSIDIAN) tnt++; - if(blockMaterial == Material.SLIME_BLOCK) + if(blockMaterial == Material.SLIME_BLOCK || blockMaterial == Material.BEDROCK) slime++; if(blockMaterial == Material.DISPENSER)