diff --git a/BauSystem_Main/src/BauSystem.properties b/BauSystem_Main/src/BauSystem.properties index 69c3f87a..c63af658 100644 --- a/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem_Main/src/BauSystem.properties @@ -209,25 +209,23 @@ LOADTIMER_SUMARY_TIMES_HEAD = §7Zeiten: §eSekunden §7(§eTicks§7) LOADTIMER_SUMARY_TIMES_START = §7 || §7Start! LOADTIMER_SUMARY_TIMES_ACTIVATION = §7 || Aktivierung: §e{0}s §7(§e{1}t§7) LOADTIMER_SUMARY_TIMES_IGNITION = §7 || Zündung: §e{0}s §7(§e{1}t§7) -LOADTIMER_SUMARY_TIMES_EXPLOSION = §7 || Explosion: §e{0}s §7(§e{1}t§7) -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 - - +LOADTIMER_SUMARY_TIMES_EXPLOSION=§7 || Explosion: §e{0}s §7(§e{1}t§7) +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_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 -MATERIAL_TNT_UNBREAKABLE = §8- §eNicht Zerstörbar durch TNT -MATERIAL_TRANSPARENT = §8- §eTransparenter Block -MATERIAL_SOLID = §8- §eSolider Block -MATERIAL_GRAVITY = §8- §eFallender Block -MATERIAL_OCCLUDING = §8- §eOccluding Block -MATERIAL_INTERACT-ABLE = §8- §eInterargierbarer Block +MATERIAL_BLAST-RESISTANCE=§8- §eBlast Resistance§8: §7{0} +MATERIAL_TNT_BREAKABLE=§8- §eZerstörbar durch TNT +MATERIAL_TNT_UNBREAKABLE=§8- §eNicht Zerstörbar durch TNT +MATERIAL_TRANSPARENT=§8- §eTransparenter Block +MATERIAL_SOLID=§8- §eSolider Block +MATERIAL_GRAVITY=§8- §eFallender Block +MATERIAL_OCCLUDING=§8- §eOccluding Block +MATERIAL_INTERACT-ABLE=§8- §eInterargierbarer Block MATERIAL_FLAMMABLE = §8- §eFlammbarer Block \ No newline at end of file diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java index be6d29d4..aed64ed6 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java @@ -107,6 +107,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); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/other/SlotCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/other/SlotCommand.java index eaee813c..30258004 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/other/SlotCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/other/SlotCommand.java @@ -59,10 +59,9 @@ public class SlotCommand extends SWCommand { Block block = player.getTargetBlockExact(6); ItemStack itemStack; if (block == null) { - itemStack = new ItemStack(Material.AIR); - } else { - itemStack = new ItemStack(block.getType()); + return; } + itemStack = new ItemStack(block.getType()); SWUtils.giveItemToPlayer(player, itemStack); }