Merge branch 'master' into cmd_framework_update

SchematicSystem_Core/src/SchematicSystem.properties

@@ -1,8 +1,8 @@
 PREFIX=§eSchematic§8» §7
 ON=§aon
 OFF=§coff
-CHANGE=§7change
+CHANGE=§7To change
-CLICK=§7click
+CLICK=§7Click
 CURRENT=§7Current: {0}
 CONFIRM=§aConfirm
 CANCEL=§cCancel

SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java

@@ -82,7 +82,7 @@ public class GUI {
                 changeItem(player, node, back);
             });
             if(!node.isDir()) {
-                inv.setItem(6, SWItem.getMaterial("CAULDRON_ITEM"), SchematicSystem.MESSAGE.parse("GUI_INFO_TYPE", player, mat.name()), Arrays.asList(SchematicSystem.MESSAGE.parse("CHANGE", player), SchematicSystem.MESSAGE.parse("CLICK", player)), node.getSchemtype().fightType(), click -> {
+                inv.setItem(6, node.getSchemtype().getMaterial(), SchematicSystem.MESSAGE.parse("GUI_INFO_TYPE", player, node.getSchemtype().name()), Arrays.asList(SchematicSystem.MESSAGE.parse("CHANGE", player), SchematicSystem.MESSAGE.parse("CLICK", player)), node.getSchemtype().fightType(), click -> {
                     changeType(player, node);
                 });
                 inv.setItem(7, SWItem.getMaterial("MAGENTA_GLAZED_TERRACOTTA"), SchematicSystem.MESSAGE.parse("GUI_INFO_DOWNLOAD", player), click -> {

SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java

@@ -455,7 +455,7 @@ public class SchematicCommand extends SWCommand {
             return;
         }
 
-        addMember(player, node, team.getMembers().stream().map(SteamwarUser::get).toArray(SteamwarUser[]::new));
+        addMember(player, node, team.getMembers().stream().map(SteamwarUser::get).filter(steamwarUser -> steamwarUser.getId() != user.getId()).toArray(SteamwarUser[]::new));
     }
 
     @Register("delteam")