A probably working ignore system

Signed-off-by: Lixfel <agga-games@gmx.de>

src/de/steamwar/bungeecore/BungeeCore.java

@@ -99,6 +99,8 @@ public class BungeeCore extends Plugin {
         new CheckCommand();
         new RankedCommand();
         new RankCommand();
+        new IgnoreCommand();
+        new UnIgnoreCommand();
 
         new EventStarter();
         new Broadcaster();

src/de/steamwar/bungeecore/commands/ChallengeCommand.java

@@ -24,19 +24,18 @@ public class ChallengeCommand extends BasicCommand {
             return;
         }
         
-        if (!(sender instanceof ProxiedPlayer)) {return;}
+        if (!(sender instanceof ProxiedPlayer))
+            return;
 
         ProxiedPlayer target = ProxyServer.getInstance().getPlayer(args[0]);
         if(target == null){
-            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cDer gewünschte Spieler ist nicht online.");
+            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cDer Herausgeforderte ist nicht online.");
             return;
         }else if(target == sender){
             BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cSchizophren?");
             return;
-        }
+        }else if (IgnoreSystem.isIgnored(target, (ProxiedPlayer) sender)) {
-        
+            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cDer Herausgeforderte hat dich geblockt.");
-        if (IgnoreSystem.isIgnored(target.getUniqueId(), ((ProxiedPlayer) sender).getUniqueId())) {
-        	BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cDer gewünschte Spieler hat dich geblockt.");
             return;
         }
 

src/de/steamwar/bungeecore/commands/IgnoreCommand.java

@@ -13,20 +13,30 @@ public class IgnoreCommand extends BasicCommand {
 	}
 
 	@Override
-	public void execute(CommandSender s, String[] args) {
+	public void execute(CommandSender sender, String[] args) {
-		if (!(s instanceof ProxiedPlayer)) return;
+		if(args.length < 1) {
-		ProxiedPlayer p = (ProxiedPlayer) s;
+			BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§8/§eignore §8[§7Spieler§8]");
-		SteamwarUser target = SteamwarUser.get(args[0]);
-        if(target == null){
-            BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDieser Spieler wurde nicht in der Datenbank gefunden!");
 			return;
-        }else if(target.equals(p)){
-            BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cWie willst du dich selber ignorieren?");
-            return;
-        }else {
-        	IgnoreSystem.ignore(p.getUniqueId(), target.getUuid());
-        	 BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§7Du ignorierst nun " + target.getUserName() + ".");
-        }
 		}
 
+		if (!(sender instanceof ProxiedPlayer))
+			return;
+		ProxiedPlayer p = (ProxiedPlayer) sender;
+		SteamwarUser user = SteamwarUser.get(p.getUniqueId());
+
+		SteamwarUser target = SteamwarUser.get(args[0]);
+        if(target == null){
+            BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDiesen Spieler gibt es nicht.");
+            return;
+        }else if(target.equals(user)){
+            BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cWie willst du dich selber ignorieren?");
+            return;
+        }else if(IgnoreSystem.isIgnored(user, target)){
+			BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDu ignorierst diesen Spieler bereits.");
+			return;
+		}
+
+        IgnoreSystem.ignore(user, target);
+        BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§7Du ignorierst nun §e" + target.getUserName() + "§8.");
+	}
 }

src/de/steamwar/bungeecore/commands/MsgCommand.java

@@ -38,7 +38,7 @@ public class MsgCommand extends BasicCommand {
             if(target == null){
                 BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§cDieser Spieler ist derzeit nicht online!");
                 return;
-            }else if (IgnoreSystem.isIgnored(target.getUniqueId(), player.getUniqueId())) {
+            }else if (IgnoreSystem.isIgnored(target, player)) {
             	BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§cDieser Spieler hat dich geblockt!");
                 return;
             }else if(target.getChatMode() != ProxiedPlayer.ChatMode.SHOWN){

src/de/steamwar/bungeecore/commands/RCommand.java

@@ -31,14 +31,12 @@ public class RCommand extends BasicCommand {
             if(target == null){
                 BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§cDu hast bisher mit niemandem geschrieben!");
                 return;
-            }
+            }else if(!target.isConnected()){
-        	if (IgnoreSystem.isIgnored(target.getUniqueId(), player.getUniqueId())) {
-        		BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§cDieser Spieler hat dich geblockt!");
-        		return;
-        	}
-            if(!target.isConnected()){
                 BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§cDieser Spieler ist derzeit nicht online!");
                 return;
+            }else if (IgnoreSystem.isIgnored(target, player)) {
+                BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§cDieser Spieler hat dich geblockt!");
+                return;
             }else if(target.getChatMode() != ProxiedPlayer.ChatMode.SHOWN){
                 BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§cDieser Spieler empfängt derzeit keine Chatnachrichten!");
                 return;

src/de/steamwar/bungeecore/commands/UnIgnoreCommand.java

@@ -13,17 +13,28 @@ public class UnIgnoreCommand extends BasicCommand {
 	}
 
 	@Override
-	public void execute(CommandSender s, String[] args) {
+	public void execute(CommandSender sender, String[] args) {
-		if (!(s instanceof ProxiedPlayer)) return;
+		if(args.length < 1) {
-		ProxiedPlayer p = (ProxiedPlayer) s;
+			BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§8/§eunignore §8[§7Spieler§8]");
-		SteamwarUser t = SteamwarUser.get(args[0]);
-		if(t == null){
-			BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDieser Spieler ist derzeit nicht online!");
 			return;
-		}else {
-			IgnoreSystem.unIgnore(p.getUniqueId(), t.getUuid());
-			BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§7Du beachtest nun " + t.getUserName() + " wieder.");
 		}
+
+		if (!(sender instanceof ProxiedPlayer))
+			return;
+		ProxiedPlayer p = (ProxiedPlayer) sender;
+		SteamwarUser user = SteamwarUser.get(p.getUniqueId());
+
+		SteamwarUser target = SteamwarUser.get(args[0]);
+		if(target == null){
+			BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDiesen Spieler gibt es nicht!");
+			return;
+		}else if(!IgnoreSystem.isIgnored(user, target)){
+			BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDu ignorierst diesen Spieler nicht.");
+			return;
+		}
+
+		IgnoreSystem.unIgnore(user, target);
+		BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§7Du empfängst nun wieder Nachrichten von §e" + target.getUserName() + "§8.");
 	}
 
 }

src/de/steamwar/bungeecore/sql/IgnoreSystem.java

@@ -1,26 +1,31 @@
 package de.steamwar.bungeecore.sql;
 
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
 import java.sql.SQLException;
-import java.util.UUID;
 
 public class IgnoreSystem{
-	//SQL-Table: 
+	private IgnoreSystem(){}
-	// Name=UserIgnoreSystem
-	// Content: a ([UUID des Ignoriers]z[UUID des Ignorierten])
-	//     UUID is a HEX-Number -> it cant contain 'z'
 
-	public static boolean isIgnored(UUID ignorer, UUID ignored) {
+	public static boolean isIgnored(ProxiedPlayer ignorer, ProxiedPlayer ignored){
+		SteamwarUser user = SteamwarUser.get(ignorer.getUniqueId());
+		SteamwarUser target = SteamwarUser.get(ignored.getUniqueId());
+		return isIgnored(user, target);
+	}
+
+	public static boolean isIgnored(SteamwarUser ignorer, SteamwarUser ignored) {
 		try {
-			return !(SQL.select("SELECT * FROM UserIgnoreSystem WHERE a = ?", ignorer.toString()+"z"+ignored.toString())).next();
+			return !SQL.select("SELECT * FROM Ignore WHERE Ignorer = ? AND Ignored = ?", ignorer.getId(), ignored.getId()).next();
-		} catch (SQLException e) {return false;}
+		} catch (SQLException e) {
-	}
+			throw new SecurityException("Could not check if ignored", e);
-	public static void ignore(UUID victim, UUID offender) {
+		}
-		if (victim==null || offender==null) return;
+	}
-		if (!isIgnored(victim,offender))
+
-			SQL.update("INSERT INTO UserIgnoreSystem (a) VALUES (?)",victim.toString()+"z"+offender.toString());
+	public static void ignore(SteamwarUser ignorer, SteamwarUser ignored) {
-	}
+		SQL.update("INSERT INTO Ignore (Ignorer, Ignored) VALUES (?, ?)", ignorer.getId(), ignored.getId());
-	public static void unIgnore(UUID victim, UUID offender) {
+	}
-		if (victim==null || offender==null) return;
+
-		SQL.update("DELETE FROM UserIgnoreSystem WHERE a = " + victim.toString()+"z"+offender.toString());
+	public static void unIgnore(SteamwarUser ignorer, SteamwarUser ignored) {
+		SQL.update("DELETE FROM Ignore WHERE Ignorer = ? AND Ignored = ?", ignorer.getId(), ignored.getId());
 	}
 }