SteamWar/SchematicSystem
SteamWar/SchematicSystem
Archiviert
13
0
Fork 0
Code Issues 3 Pull-Requests 1 Releases Wiki Aktivität

Merge pull request 'Requested allowed changes' (#73) from requestedChanges into master

Quellcode durchsuchen 
Reviewed-on: #73
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
Dieser Commit ist enthalten in:
YoyoNow 2021-03-08 15:46:43 +01:00
Commit bb5f56b7f8
2 geänderte Dateien mit 9 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

3
SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java
Datei anzeigen

@ -82,6 +82,9 @@ class CheckSchemType_12 {
flowers.add(Material.YELLOW_FLOWER); flowers.add(Material.YELLOW_FLOWER);
flowers.add(Material.RED_ROSE); flowers.add(Material.RED_ROSE);
flowers.add(Material.DOUBLE_PLANT); flowers.add(Material.DOUBLE_PLANT);
flowers.add(Material.DIAMOND_BARDING);
flowers.add(Material.IRON_BARDING);
flowers.add(Material.GOLD_BARDING);
FLOWERS = flowers; FLOWERS = flowers;
} }

8
SchematicSystem_15/src/de/steamwar/schematicsystem/CheckSchemType_15.java
Datei anzeigen

@ -83,7 +83,11 @@ class CheckSchemType_15 {
Material.CORNFLOWER, Material.CORNFLOWER,
Material.LILY_OF_THE_VALLEY, Material.LILY_OF_THE_VALLEY,
Material.WITHER_ROSE, 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(){} private CheckSchemType_15(){}
@ -177,7 +181,7 @@ class CheckSchemType_15 {
if(blockMaterial == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW))) if(blockMaterial == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW)))
counter += item.getByte("Count"); 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")); result.foundForbiddenItem(blockMaterial.name(), itemType.name(), item.getByte("Count"));
else if(item.containsKey("tag")) else if(item.containsKey("tag"))
result.foundItemWithTag(blockMaterial.name(), itemType.name(), item.getByte("Count")); result.foundItemWithTag(blockMaterial.name(), itemType.name(), item.getByte("Count"));