From 88f9f8608a5b7b651a8c05e3d35bc7b24f7487ad Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Mon, 6 Jan 2020 21:14:51 +0100
Subject: [PATCH] =?UTF-8?q?Pinker=20Teppich=20im=20Fightsystem=20zu=20Team?=
 =?UTF-8?q?farbe=20replacen=20hinzugef=C3=BCgt=20(1.8=20+=201.14)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FightSystem_14/FightSystem_14.iml             | 22 +++++++++++++++++++
 .../fightsystem/fight/FightTeam_14.java       |  2 ++
 FightSystem_8/FightSystem_8.iml               | 18 +++++++++++++++
 .../fightsystem/fight/FightTeam_8.java        |  4 ++++
 4 files changed, 46 insertions(+)
 create mode 100644 FightSystem_14/FightSystem_14.iml
 create mode 100644 FightSystem_8/FightSystem_8.iml

diff --git a/FightSystem_14/FightSystem_14.iml b/FightSystem_14/FightSystem_14.iml
new file mode 100644
index 0000000..0a7836e
--- /dev/null
+++ b/FightSystem_14/FightSystem_14.iml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:Spigot:1.14" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:WorldEdit:1.15" level="project" />
+    <orderEntry type="module" module-name="FightSystem_API" />
+    <orderEntry type="module" module-name="FightSystem_12" />
+    <orderEntry type="module" module-name="FightSystem_10" />
+    <orderEntry type="module" module-name="FightSystem_9" />
+    <orderEntry type="module" module-name="FightSystem_8" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:SpigotCore:2.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:ProtocolLib:1.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/FightSystem_14/src/de/steamwar/fightsystem/fight/FightTeam_14.java b/FightSystem_14/src/de/steamwar/fightsystem/fight/FightTeam_14.java
index 3e3c7c0..e6cd189 100644
--- a/FightSystem_14/src/de/steamwar/fightsystem/fight/FightTeam_14.java
+++ b/FightSystem_14/src/de/steamwar/fightsystem/fight/FightTeam_14.java
@@ -35,6 +35,7 @@ class FightTeam_14 {
     private static final Set<BaseBlock> GLASS_PANE_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS_PANE).getDefaultState().toBaseBlock());
     private static final Set<BaseBlock> CONCRETE_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CONCRETE).getDefaultState().toBaseBlock());
     private static final Set<BaseBlock> CONCRETE_POWDER_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CONCRETE_POWDER).getDefaultState().toBaseBlock());
+    private static final Set<BaseBlock> CARPET_SET = Collections.singleton(Objects.requireNonNull(BlockTypes.PINK_CARPET).getDefaultState().toBaseBlock());
 
     static void setTeamColor(Team team, ChatColor color){
         team.setColor(color);
@@ -46,6 +47,7 @@ class FightTeam_14 {
         CuboidRegion region = new CuboidRegion(corner3, corner3.add(schemsize3));
         try {
             e.replaceBlocks(region, WOOL_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_wool")).getDefaultState().toBaseBlock());
+            e.replaceBlocks(region, CARPET_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_carpet")).getDefaultState().toBaseBlock());
             e.replaceBlocks(region, CLAY_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_terracotta")).getDefaultState().toBaseBlock());
             e.replaceBlocks(region, GLASS_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass")).getDefaultState().toBaseBlock());
             e.replaceBlocks(region, GLASS_PANE_SET, Objects.requireNonNull(BlockTypes.get(c.name().toLowerCase() + "_stained_glass_pane")).getDefaultState().toBaseBlock());
diff --git a/FightSystem_8/FightSystem_8.iml b/FightSystem_8/FightSystem_8.iml
new file mode 100644
index 0000000..07d061f
--- /dev/null
+++ b/FightSystem_8/FightSystem_8.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:Spigot:1.8" level="project" />
+    <orderEntry type="module" module-name="FightSystem_API" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:WorldEdit:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:SpigotCore:2.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:ProtocolLib:1.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/FightSystem_8/src/de/steamwar/fightsystem/fight/FightTeam_8.java b/FightSystem_8/src/de/steamwar/fightsystem/fight/FightTeam_8.java
index 0e21939..66cd22c 100644
--- a/FightSystem_8/src/de/steamwar/fightsystem/fight/FightTeam_8.java
+++ b/FightSystem_8/src/de/steamwar/fightsystem/fight/FightTeam_8.java
@@ -44,11 +44,14 @@ class FightTeam_8 {
     private static final BaseBlock CLAY = new BaseBlock(Material.CLAY.getId(), COLOR_TO_REPLACE);
     @SuppressWarnings("deprecation")
     private static final BaseBlock GLASS_PANE = new BaseBlock(Material.STAINED_GLASS_PANE.getId(), COLOR_TO_REPLACE);
+    @SuppressWarnings("deprecation")
+    private static final BaseBlock CARPET = new BaseBlock(Material.CARPET.getId(), COLOR_TO_REPLACE);
 
     private static final Set<BaseBlock> WOOL_SET = Collections.singleton(WOOL);
     private static final Set<BaseBlock> CLAY_SET = Collections.singleton(CLAY);
     private static final Set<BaseBlock> GLASS_SET = Collections.singleton(GLASS);
     private static final Set<BaseBlock> GLASS_PANE_SET = Collections.singleton(GLASS_PANE);
+    private static final Set<BaseBlock> CARPET_SET = Collections.singleton(CARPET);
 
     static void setTeamColor(Team team, ChatColor color){
         team.setPrefix("§" + color.getChar());
@@ -63,6 +66,7 @@ class FightTeam_8 {
             e.replaceBlocks(region, CLAY_SET, new BaseBlock(CLAY.getId(), c.getWoolData()));
             e.replaceBlocks(region, GLASS_SET, new BaseBlock(GLASS.getId(), c.getWoolData()));
             e.replaceBlocks(region, GLASS_PANE_SET, new BaseBlock(GLASS_PANE.getId(), c.getWoolData()));
+            e.replaceBlocks(region, CARPET_SET, new BaseBlock(CARPET.getId(), c.getWoolData()));
         } catch (MaxChangedBlocksException ex) {
             // ignore, will never occur
         }