bugs bugs bugs

lang.yml

@@ -24,7 +24,7 @@ error:
     breakClaimedChest: "&cYou cannot break an occupied chest!"
     
 help:
-    abba: "&aabba <subcommand>"
+    abba: "&aabba <%s>"
     
     join: "&aabba join [game]&f: Joins the Abba Match"
     leave: "&aabba leave&f: Leaves current Abba Game"

src/me/lennartVH01/CommandHandler.java

@@ -18,6 +18,8 @@ import java.util.UUID;
 
 
 
+
+
 import me.lennartVH01.game.BasicAbbaGame;
 import me.lennartVH01.game.ContrabandScanner;
 import me.lennartVH01.game.GameManager;
@@ -31,6 +33,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permissible;
 import org.bukkit.plugin.java.JavaPlugin;
 
 
@@ -555,6 +558,10 @@ public class CommandHandler implements CommandExecutor, TabCompleter{
 	
 	@Override
 	public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args){
+		if(args.length == 0){
+			sendHelpMessage(sender);
+			return false;
+		}
 		CommandFunc command = commands.get(args[0].toLowerCase());
 		if(command != null){
 			if(command.hasPermission(sender)){
@@ -564,10 +571,21 @@ public class CommandHandler implements CommandExecutor, TabCompleter{
 				return false;
 			}	
 		}else{
-			sender.sendMessage(Messages.helpAbba);
+			sendHelpMessage(sender);
 		}
 		return false;
 	}
+	private void sendHelpMessage(CommandSender sender){
+		StringBuilder messageBuilder = new StringBuilder();
+		commands.forEach((name, cmd) -> {
+			if(cmd.hasPermission(sender)){
+				messageBuilder.append(name + "|");
+			}
+		});
+		messageBuilder.deleteCharAt(messageBuilder.length() - 1);
+		sender.sendMessage(String.format(Messages.helpAbba, messageBuilder.toString()));
+	}
+	
 	
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command cmd, String alias, String[] args){

src/me/lennartVH01/game/AbbaGame.java

@@ -4,7 +4,9 @@ import java.util.List;
 
 
 
-import net.minecraft.server.v1_9_R1.IChatBaseComponent;
+
+
+import net.minecraft.server.v1_9_R2.IChatBaseComponent;
 
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;

src/me/lennartVH01/game/BasicAbbaGame.java

@@ -3,12 +3,13 @@ package me.lennartVH01.game;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
 import me.lennartVH01.Config;
 import me.lennartVH01.Messages;
 import me.lennartVH01.Permission;
 import me.lennartVH01.util.ChatUtil;
-import net.minecraft.server.v1_9_R1.ChatComponentText;
-import net.minecraft.server.v1_9_R1.IChatBaseComponent;
+import net.minecraft.server.v1_9_R2.ChatComponentText;
+import net.minecraft.server.v1_9_R2.IChatBaseComponent;
 
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -133,7 +134,9 @@ public class BasicAbbaGame implements AbbaGame{
 		
 		for(int i = 0; i < scores.size(); i++){
 			AbbaScore score = scores.get(i);
-			objective.getScore(score.player.getName()).setScore(score.total);
+			Score scoreboardScore = objective.getScore(score.player.getName());
+			scoreboardScore.setScore(1);
+			scoreboardScore.setScore(score.total);
 			
 		}
 	}
@@ -219,13 +222,13 @@ public class BasicAbbaGame implements AbbaGame{
 							messageBuilder.append("{\"translate\":\"" + ChatUtil.getName(contraband.get(i)) + "\"},\"\\n\",");
 							
 						}
-						messageBuilder.setCharAt(messageBuilder.length() - 1, ']');
-						messageBuilder.append("}},");
+						messageBuilder.replace(messageBuilder.length() - 6, messageBuilder.length(), "]");
+						//messageBuilder.setCharAt(messageBuilder.length() - 1, ']');
+						messageBuilder.append("}},\"\\n\",");
 					}
 				}
 				if(!canStart){
-					messageBuilder.delete(messageBuilder.length() - 9, messageBuilder.length() - 4);
-					messageBuilder.setCharAt(messageBuilder.length() - 1, ']');
+					messageBuilder.replace(messageBuilder.length() - 6, messageBuilder.length(), "]");
 					System.out.println(messageBuilder.toString());
 					ChatUtil.send((Player) sender, ChatUtil.fromRawJSON(messageBuilder.toString()));
 				}

src/me/lennartVH01/util/ChatUtil.java

@@ -1,10 +1,10 @@
 package me.lennartVH01.util;
 
-import net.minecraft.server.v1_9_R1.IChatBaseComponent;
-import net.minecraft.server.v1_9_R1.PacketPlayOutChat;
+import net.minecraft.server.v1_9_R2.IChatBaseComponent;
+import net.minecraft.server.v1_9_R2.PacketPlayOutChat;
 
-import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 
 public class ChatUtil {