From 3bc4620bbd271a13915e31496f33396dec0c5d25 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Sat, 8 Jun 2019 13:05:02 +0200 Subject: [PATCH] public schematics can now be loaded Signed-off-by: yaruma3341 --- .../commands/SchematicCommand.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/de/warking/schematicsystem/commands/SchematicCommand.java b/src/de/warking/schematicsystem/commands/SchematicCommand.java index c2db2ad..e36cb30 100644 --- a/src/de/warking/schematicsystem/commands/SchematicCommand.java +++ b/src/de/warking/schematicsystem/commands/SchematicCommand.java @@ -51,7 +51,7 @@ public class SchematicCommand implements CommandExecutor { case 1: if(args[0].equalsIgnoreCase("list")) { - sendPlayerSchematicList(0, 15, player); + sendPlayerSchematicList(0, 15, WarkingUser.get(player.getUniqueId()).getId(), player); return false; } @@ -63,8 +63,13 @@ public class SchematicCommand implements CommandExecutor { case 2: if(args[0].equalsIgnoreCase("list")) { + if(args[1].equalsIgnoreCase("public")) { + sendPlayerSchematicList(0, 15, 0, player); + return false; + } + try { - sendPlayerSchematicList(Integer.parseInt(args[1]), 15, player); + sendPlayerSchematicList(Integer.parseInt(args[1]), 15, WarkingUser.get(player.getUniqueId()).getId(), player); return false; } catch (NumberFormatException ex) { player.sendMessage(SchematicSystem.PREFIX + "§cDu musst eine Seitenzahl angeben!"); @@ -356,6 +361,19 @@ public class SchematicCommand implements CommandExecutor { return false; case 3: + if(args[0].equalsIgnoreCase("list")) { + if(args[1].equalsIgnoreCase("public")) { + try { + sendPlayerSchematicList(Integer.parseInt(args[2]), 15, 0, player); + return false; + } catch (NumberFormatException ex) { + player.sendMessage(SchematicSystem.PREFIX + "§cDu musst eine Seitenzahl angeben!"); + return false; + } + } + return false; + } + if(args[0].equalsIgnoreCase("load")) { if(!player.hasPermission("bau.team")) return false; WarkingUser warkingUser = WarkingUser.get(args[2]); @@ -585,7 +603,7 @@ public class SchematicCommand implements CommandExecutor { player.sendMessage(SchematicSystem.PREFIX + "Befehle:"); player.sendMessage("§8/schem - §6Zeigt Informationen zum Plugin"); player.sendMessage("§8/schem help - §6Zeigt eine Liste mit Befehlen"); - player.sendMessage("§8/schem list - §6Listet deine Schematics auf"); + player.sendMessage("§8/schem list (public) - §6Listet deine (oder Public) Schematics auf"); player.sendMessage("§8/schem load [Besitzer] - §6Du lädst eine Schematic"); player.sendMessage("§8/schem save - §6Du speicherst dein Clipboard als Datei"); player.sendMessage("§8/schem changetype - §6Ändert den Typ deiner Schematic"); @@ -596,8 +614,8 @@ public class SchematicCommand implements CommandExecutor { } - public static void sendPlayerSchematicList(int currentPage, int filesPerPage, Player player) { - List schematicList = Schematic.getSchemsAccessibleByUser(player.getUniqueId()); + public static void sendPlayerSchematicList(int currentPage, int filesPerPage, int schemOwner, Player player) { + List schematicList = Schematic.getSchemsAccessibleByUser(schemOwner); if(schematicList.isEmpty()) { player.sendMessage(SchematicSystem.PREFIX + "§cDu hast noch keine Schematic(s)!");