SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
Archiviert
12
0
Fork 0
Code Issues 39 Pull-Requests Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2021-06-05 21:27:39 +02:00
Commit 9c5fcc087c
3 geänderte Dateien mit 18 neuen und 25 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

32
BauSystem_Main/src/BauSystem.properties
Datei anzeigen

@ -209,25 +209,23 @@ LOADTIMER_SUMARY_TIMES_HEAD = §7Zeiten: §eSekunden §7(§eTicks§7)
LOADTIMER_SUMARY_TIMES_START = §7 || §7Start! LOADTIMER_SUMARY_TIMES_START = §7 || §7Start!
LOADTIMER_SUMARY_TIMES_ACTIVATION = §7 || Aktivierung: §e{0}s §7(§e{1}t§7) 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_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_EXPLOSION=§7 || Explosion: §e{0}s §7(§e{1}t§7)
LOADTIMER_SUMARY_TIMES_LAST = §7\\/ LOADTIMER_SUMARY_TIMES_LAST=§7\\/
LOADTIMER_SUMARY_STATS_HEAD = §7Kanonen-Stats§8: LOADTIMER_SUMARY_STATS_HEAD=§7Kanonen-Stats§8:
LOADTIMER_SUMARY_STATS_TNT = §7TNT: §e{0} LOADTIMER_SUMARY_STATS_TNT=§7TNT: §e{0}
LOADTIMER_SUMARY_STATS_FREQ = §7Belade Frequenz: §e{0}/m§8, §7Schuss Frequenz: §e{1}/m LOADTIMER_SUMARY_STATS_FREQ=§7Belade Frequenz: §e{0}/m§8, §7Schuss Frequenz: §e{1}/m
# Other # Other
OTHER_ITEMS_TELEPORT_GUI-NAME = Teleportieren OTHER_ITEMS_TELEPORT_GUI-NAME=Teleportieren
OTHER_ITEMS_TELEPORT_PLAYER-OFFLINE=§cDer Spieler ist Offline OTHER_ITEMS_TELEPORT_PLAYER-OFFLINE=§cDer Spieler ist Offline
OTHER_SLOT_INVALID_SLOT=§cInvalid Slot 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
MATERIAL_BLAST-RESISTANCE = §8- §eBlast Resistance§8: §7{0} MATERIAL_BLAST-RESISTANCE=§8- §eBlast Resistance§8: §7{0}
MATERIAL_TNT_BREAKABLE = §8- §eZerstörbar durch TNT MATERIAL_TNT_BREAKABLE=§8- §eZerstörbar durch TNT
MATERIAL_TNT_UNBREAKABLE = §8- §eNicht Zerstörbar durch TNT MATERIAL_TNT_UNBREAKABLE=§8- §eNicht Zerstörbar durch TNT
MATERIAL_TRANSPARENT = §8- §eTransparenter Block MATERIAL_TRANSPARENT=§8- §eTransparenter Block
MATERIAL_SOLID = §8- §eSolider Block MATERIAL_SOLID=§8- §eSolider Block
MATERIAL_GRAVITY = §8- §eFallender Block MATERIAL_GRAVITY=§8- §eFallender Block
MATERIAL_OCCLUDING = §8- §eOccluding Block MATERIAL_OCCLUDING=§8- §eOccluding Block
MATERIAL_INTERACT-ABLE = §8- §eInterargierbarer Block MATERIAL_INTERACT-ABLE=§8- §eInterargierbarer Block
MATERIAL_FLAMMABLE = §8- §eFlammbarer Block MATERIAL_FLAMMABLE = §8- §eFlammbarer Block

1
BauSystem_Main/src/de/steamwar/bausystem/features/other/NoClipCommand.java
Datei anzeigen

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

10
BauSystem_Main/src/de/steamwar/bausystem/features/other/SlotCommand.java
Datei anzeigen

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