Merge remote-tracking branch 'origin/noclip' into noclip

BauSystem_Main/src/BauSystem.properties

@@ -214,13 +214,11 @@ LOADTIMER_SUMARY_TIMES_LAST = §7\\/
 LOADTIMER_SUMARY_STATS_HEAD=§7Kanonen-Stats§8:
 LOADTIMER_SUMARY_STATS_TNT=§7TNT: §e{0}
 LOADTIMER_SUMARY_STATS_FREQ=§7Belade Frequenz: §e{0}/m§8, §7Schuss Frequenz: §e{1}/m
-
-
 # Other
 OTHER_ITEMS_TELEPORT_GUI-NAME=Teleportieren
 OTHER_ITEMS_TELEPORT_PLAYER-OFFLINE=§cDer Spieler ist Offline
 OTHER_SLOT_INVALID_SLOT=§cInvalid Slot
-
+OTHER_NOCLIP_SLOT_INFO=§7Mit /slot kannst du den ausgewählten Slot ändern und einen anderen Block in den Slot nehmen.
 # Material
 MATERIAL_BLAST-RESISTANCE=§8- §eBlast Resistance§8: §7{0}
 MATERIAL_TNT_BREAKABLE=§8- §eZerstörbar durch TNT

BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java

@@ -100,6 +100,7 @@ public class NoClipCommand extends SWCommand implements Listener {
             gm1packet.getIntegers().write(0, 3);
             gm1packet.getFloat().write(0, 1F);
             NOCLIPS.add(player);
+            BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
             try {
                 ProtocolLibrary.getProtocolManager().sendServerPacket(player, gm1packet);
                 ProtocolLibrary.getProtocolManager().sendServerPacket(player, gm3packet);

BauSystem_Main/src/de/steamwar/bausystem/features/other/SlotCommand.java

@@ -40,11 +40,6 @@ public class SlotCommand extends SWCommand {
         super("slot", "s");
     }
 
-    @Register(help = true)
-    public void genericHelp(Player player, String... args) {
-
-    }
-
     @Register
     public void slotCommand(Player player, Integer slot) {
         if (slot < 1 || slot > 9) {
@@ -59,10 +54,9 @@ public class SlotCommand extends SWCommand {
         Block block = player.getTargetBlockExact(6);
         ItemStack itemStack;
         if (block == null) {
-            itemStack = new ItemStack(Material.AIR);
+            return;
-        } else {
-            itemStack = new ItemStack(block.getType());
         }
+        itemStack = new ItemStack(block.getType());
         SWUtils.giveItemToPlayer(player, itemStack);
     }