diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java index 4412685..a4391f3 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/broadcast/BroadcastSender.java @@ -118,14 +118,14 @@ public class BroadcastSender implements Commands { if(type == null) { type = ChatDoc.Destination.SERVER; destination = server._id(); - message = args.getRemainingString(0); + message = args.getJoinedStrings(0); } else if(args.argsLength() >= 2) { if(type == ChatDoc.Destination.GLOBAL) { destination = null; - message = args.getRemainingString(1); + message = args.getJoinedStrings(1); } else if(args.argsLength() >= 3) { destination = args.getString(1); - message = args.getRemainingString(2); + message = args.getJoinedStrings(2); if(!destinations.contains(destination)) { throw newCommandException(sender, new WarningComponent("command.error.invalidOption", destination, destinations)); } diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java index 718eab4..04184bf 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java @@ -75,7 +75,7 @@ public class ChannelCommands implements Commands, Listener { audiences.get(player).sendMessage(new TranslatableComponent("channels.default.set", typeName)); } } else { - channel.chat(sender, args.getRemainingString(0)); + channel.chat(sender, args.getJoinedStrings(0)); } } else { throw new CommandPermissionsException(); diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java index b6f16a1..6ed8ddf 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/MiscCommands.java @@ -212,7 +212,7 @@ public class MiscCommands implements Commands { if(!sender.equals(other) && !sender.hasPermission("sudo.others")) { throw new CommandPermissionsException(); } - String command = args.getRemainingString(index); + String command = args.getJoinedStrings(index); List commands = getPermutations(sender, command); String explanation; if(commands.size() == 1) { diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java index dca2362..4562b17 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/punishment/PunishmentCommands.java @@ -87,7 +87,7 @@ public class PunishmentCommands implements Commands { public void create(CommandContext args, CommandSender sender, @Nullable Type type, @Nullable Duration duration) throws CommandException { final User punisher = userFinder.getLocalUser(sender); - final String reason = args.getRemainingString(duration == null ? 1 : 2); + final String reason = args.getJoinedStrings(duration == null ? 1 : 2); final boolean auto = flag('a', args, sender); final boolean silent = flag('s', args, sender); final boolean offrecord = flag('o', args, sender); diff --git a/PGM/src/main/java/tc/oc/pgm/flag/LegacyFlagPlayerFacet.java b/PGM/src/main/java/tc/oc/pgm/flag/LegacyFlagPlayerFacet.java index 8752dcd..452b428 100644 --- a/PGM/src/main/java/tc/oc/pgm/flag/LegacyFlagPlayerFacet.java +++ b/PGM/src/main/java/tc/oc/pgm/flag/LegacyFlagPlayerFacet.java @@ -53,6 +53,8 @@ public class LegacyFlagPlayerFacet implements MatchPlayerFacet, Listener { protected void trackFlag(Flag flag) { if(lessThan(MINECRAFT_1_8, bukkit.getProtocolVersion())) { beams.put(flag, beams.getOrDefault(flag, new Beam(flag))); + +// flag.getLocation().ifPresent(location -> bukkit.sendBlockChange(location, Material.AIR, (byte) 0)); } } diff --git a/PGM/src/main/java/tc/oc/pgm/flag/state/Carried.java b/PGM/src/main/java/tc/oc/pgm/flag/state/Carried.java index 10be505..38b65a0 100644 --- a/PGM/src/main/java/tc/oc/pgm/flag/state/Carried.java +++ b/PGM/src/main/java/tc/oc/pgm/flag/state/Carried.java @@ -19,6 +19,7 @@ import tc.oc.commons.bukkit.inventory.ArmorType; import tc.oc.commons.core.IterableUtils; import tc.oc.commons.core.chat.Component; import tc.oc.commons.core.chat.Components; +import tc.oc.minecraft.protocol.MinecraftVersion; import tc.oc.pgm.events.PlayerLeavePartyEvent; import tc.oc.pgm.filters.query.PlayerQueryWithLocation; import tc.oc.pgm.flag.Flag; @@ -167,9 +168,11 @@ public class Carried extends Spawned implements Missing { @Override public void tickRunning() { super.tickRunning(); - BaseComponent message = this.getMessage(); - this.carrier.sendHotbarMessage(message); + + if (MinecraftVersion.atLeast(MinecraftVersion.MINECRAFT_1_8, this.carrier.getBukkit().getProtocolVersion())) { + this.carrier.sendHotbarMessage(message); + } if(!Components.equals(message, this.lastMessage)) { this.lastMessage = message;