Fix some bugs

Aless · BakaAless · commit 33f8ce279b2a · 2020-04-25T17:35:10.000+02:00
Add radius &amp; time expired
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
diff --git a/src/main/java/fr/bakaaless/Trader/commands/Executor.java b/src/main/java/fr/bakaaless/Trader/commands/Executor.java
@@ -4,10 +4,12 @@
 import fr.bakaaless.Trader.plugin.TraderPlugin;
 import lombok.AccessLevel;
 import lombok.Getter;
+import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
@@ -26,7 +28,7 @@ public class Executor implements CommandExecutor, TabCompleter {
     public Executor() {
         this.main = TraderPlugin.getInstance();
         this.accept = new HashMap<>();
-        this.getMain().getCommand("trader").setExecutor(this);
+        this.getMain().getCommand("echange").setExecutor(this);
     }
 
     @Override
@@ -36,11 +38,16 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
         final Player player = (Player) sender;
         try {
+            final int radius = this.getMain().getFileManager().getFile("config").getInt("radius");
             if (args[0].equalsIgnoreCase("accept")) {
                 if (!this.getAccept().containsKey(player)) {
                     player.sendMessage(this.getMain().getFileManager().getErrorWithPrefix("none"));
                     return true;
                 }
+                if (!this.getPlayerRadius(player.getLocation(), radius).contains(this.getAccept().get(player))) {
+                    player.sendMessage(this.getMain().getFileManager().getErrorWithPrefix("outrange"));
+                    return true;
+                }
                 player.sendMessage(this.getMain().getFileManager().getMessageWithPrefix("accept"));
                 this.getAccept().get(player).sendMessage(this.getMain().getFileManager().getMessageWithPrefix("accept"));
                 this.getMain().addTraders(new Trader(player, this.getAccept().get(player)));
@@ -62,14 +69,14 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                     return true;
                 }
             }
-            for (final Player players : this.getMain().getServer().getOnlinePlayers()) {
+            for (final Player players : this.getPlayerRadius(player.getLocation(), radius)) {
                 if (!players.getName().toLowerCase().equalsIgnoreCase(args[0])) continue;
                 if (player.equals(players)) {
                     player.sendMessage(this.getMain().getFileManager().getErrorWithPrefix("yourself"));
                     return true;
                 }
                 if (this.getAccept().containsKey(player) && this.getAccept().get(player).equals(players)) {
-                    return player.performCommand("trader accept");
+                    return player.performCommand(label + " accept");
                 }
                 player.sendMessage(this.getMain().getFileManager().getMessageWithPrefix("sent"));
                 players.sendMessage(this.getMain().getFileManager().getMessageWithPrefix("receive").replace("%player%", player.getName()));
@@ -80,7 +87,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                         players.sendMessage(this.getMain().getFileManager().getErrorWithPrefix("expired"));
                         this.getAccept().remove(player);
                     }
-                }, 120L * 20L);
+                }, this.getMain().getFileManager().getFile("config").getInt("expired") * 20L);
                 return true;
             }
             player.sendMessage(this.getMain().getFileManager().getErrorWithPrefix("found"));
@@ -93,6 +100,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
     @Override
     public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] args) {
         final ArrayList<String> completions = new ArrayList<>();
+        if (!(commandSender instanceof Player)) {
+            if ("stop".startsWith(args[0].toLowerCase()))
+                completions.add("stop");
+            return completions;
+        }
         if (args.length == 1) {
             if ("accept".startsWith(args[0].toLowerCase()))
                 completions.add("accept");
@@ -101,7 +113,7 @@ public List<String> onTabComplete(CommandSender commandSender, Command command,
             if (commandSender.hasPermission("trader.stop"))
                 if ("stop".startsWith(args[0].toLowerCase()))
                     completions.add("stop");
-            for (final Player player : this.getMain().getServer().getOnlinePlayers()) {
+            for (final Player player : this.getPlayerRadius(((Player) commandSender).getLocation(), this.getMain().getFileManager().getFile("config").getInt("radius"))) {
                 if (player.getName().toLowerCase().startsWith(args[0].toLowerCase())) {
                     if (player.equals(commandSender)) continue;
                     completions.add(player.getName());
@@ -111,4 +123,16 @@ public List<String> onTabComplete(CommandSender commandSender, Command command,
         }
         return new ArrayList<>();
     }
+
+    private List<Player> getPlayerRadius(final Location location, final int radius) {
+        final List<Player> players = new ArrayList<>();
+        for (final Entity entity : location.getWorld().getNearbyEntities(location, radius, radius, radius)) {
+            if (entity instanceof Player) {
+                if (entity.getName().contains("&") || entity.getName().contains("§") || ((Player) entity).isSleepingIgnored() || !((Player) entity).isOnline())
+                    continue;
+                players.add((Player) entity);
+            }
+        }
+        return players;
+    }
 }
diff --git a/src/main/java/fr/bakaaless/Trader/object/Trader.java b/src/main/java/fr/bakaaless/Trader/object/Trader.java
@@ -99,6 +99,7 @@ private void cancel(final Player cancelled) {
         InventoryDragEvent.getHandlerList().unregister(this);
         InventoryClickEvent.getHandlerList().unregister(this);
         if (this.getStatus().equals(TransactStatus.FINISH)) return;
+        this.status = TransactStatus.CANCELLED;
         for (final Player player : this.getPlayerInventoryMap().keySet()) {
             if (!player.equals(cancelled)) {
                 player.sendMessage(this.main.getFileManager().getErrorWithPrefix("cancel.other"));
@@ -114,6 +115,7 @@ private void cancel(final Player cancelled) {
             }
             player.closeInventory();
         }
+        this.status = TransactStatus.FINISH;
         this.main.removeTraders(this);
     }
 
@@ -122,7 +124,7 @@ public void stop() {
         InventoryDragEvent.getHandlerList().unregister(this);
         InventoryClickEvent.getHandlerList().unregister(this);
         if (this.getStatus().equals(TransactStatus.FINISH)) return;
-
+        this.status = TransactStatus.CANCELLED;
         for (final Player player : this.getPlayerInventoryMap().keySet()) {
             player.sendMessage(this.main.getFileManager().getErrorWithPrefix("cancel.console"));
             final Inventory inventory = player.getOpenInventory().getTopInventory();
@@ -135,6 +137,7 @@ public void stop() {
             }
             player.closeInventory();
         }
+        this.status = TransactStatus.FINISH;
         this.main.removeTraders(this);
     }
 
@@ -227,7 +230,7 @@ public void onInventoryClick(final InventoryClickEvent e) {
                 e.getClickedInventory().setItem(39, ItemUtils.get(Material.GREEN_CONCRETE, this.titles.get("status.ready")));
                 e.getClickedInventory().setItem(45, ItemUtils.get(Material.ORANGE_CONCRETE, this.titles.get("edit")));
                 this.getPlayerStatusMap().replace(player, PlayerStatus.WAITING);
-                if (this.getPlayerStatusMap().get(other).equals(PlayerStatus.WAITING)) {
+                if (this.getPlayerStatusMap().get(other).equals(PlayerStatus.WAITING) && this.getStatus().equals(TransactStatus.WAITING)) {
                     this.progress();
                 }
                 return;
@@ -360,6 +363,7 @@ private synchronized void addItem(final Player player, final ItemStack itemStack
     private enum TransactStatus {
         WAITING,
         STARTING,
+        CANCELLED,
         FINISH
     }
 
diff --git a/src/main/java/fr/bakaaless/Trader/plugin/TraderPlugin.java b/src/main/java/fr/bakaaless/Trader/plugin/TraderPlugin.java
@@ -40,7 +40,7 @@ public void onEnable() {
         }
         TraderPlugin.instance = this;
         try {
-            this.fileManager = new FileManager(this, "messages");
+            this.fileManager = new FileManager(this, "messages", "config");
         } catch (IOException | InvalidConfigurationException e) {
             this.getLogger().log(Level.SEVERE, ChatColor.translateAlternateColorCodes('&', "§c§lTrading §4§l» §cError while retrieve creating files."));
         }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -0,0 +1,2 @@
+radius: 10 # in blocks
+expired: 60 # in seconds
diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml
@@ -31,4 +31,5 @@ messages:
     deny: "&cDemande d'échange refusée."
     expired: "&cDemande d'échange expirée."
     yourself: "&cVous ne pouvez pas échanger avec votre alter ego."
-    found: "&cAucun joueur trouvé."
+    found: "&cAucun joueur trouvé. Il est peut-être trop éloigné."
+    outrange: "&Le joueur est hors de portée."
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,10 +1,10 @@
 main: fr.bakaaless.Trader.plugin.TraderPlugin
-version: 0.0.1-ALPHA
+version: 0.1.3-BETA
 name: Trader
 author: BakaAless
 api-version: 1.15
 softdepend:
   - Vault
 commands:
-  trader:
+  echange:
     usage: ""

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ private void cancel(final Player cancelled) {`
`99`	`99`	`InventoryDragEvent.getHandlerList().unregister(this);`
`100`	`100`	`InventoryClickEvent.getHandlerList().unregister(this);`
`101`	`101`	`if (this.getStatus().equals(TransactStatus.FINISH)) return;`
	`102`	`+ this.status = TransactStatus.CANCELLED;`
`102`	`103`	`for (final Player player : this.getPlayerInventoryMap().keySet()) {`
`103`	`104`	`if (!player.equals(cancelled)) {`
`104`	`105`	`player.sendMessage(this.main.getFileManager().getErrorWithPrefix("cancel.other"));`
`@@ -114,6 +115,7 @@ private void cancel(final Player cancelled) {`
`114`	`115`	`}`
`115`	`116`	`player.closeInventory();`
`116`	`117`	`}`
	`118`	`+ this.status = TransactStatus.FINISH;`
`117`	`119`	`this.main.removeTraders(this);`
`118`	`120`	`}`
`119`	`121`
`@@ -122,7 +124,7 @@ public void stop() {`
`122`	`124`	`InventoryDragEvent.getHandlerList().unregister(this);`
`123`	`125`	`InventoryClickEvent.getHandlerList().unregister(this);`
`124`	`126`	`if (this.getStatus().equals(TransactStatus.FINISH)) return;`
`125`		`-`
	`127`	`+ this.status = TransactStatus.CANCELLED;`
`126`	`128`	`for (final Player player : this.getPlayerInventoryMap().keySet()) {`
`127`	`129`	`player.sendMessage(this.main.getFileManager().getErrorWithPrefix("cancel.console"));`
`128`	`130`	`final Inventory inventory = player.getOpenInventory().getTopInventory();`
`@@ -135,6 +137,7 @@ public void stop() {`
`135`	`137`	`}`
`136`	`138`	`player.closeInventory();`
`137`	`139`	`}`
	`140`	`+ this.status = TransactStatus.FINISH;`
`138`	`141`	`this.main.removeTraders(this);`
`139`	`142`	`}`
`140`	`143`
`@@ -227,7 +230,7 @@ public void onInventoryClick(final InventoryClickEvent e) {`
`227`	`230`	`e.getClickedInventory().setItem(39, ItemUtils.get(Material.GREEN_CONCRETE, this.titles.get("status.ready")));`
`228`	`231`	`e.getClickedInventory().setItem(45, ItemUtils.get(Material.ORANGE_CONCRETE, this.titles.get("edit")));`
`229`	`232`	`this.getPlayerStatusMap().replace(player, PlayerStatus.WAITING);`
`230`		`- if (this.getPlayerStatusMap().get(other).equals(PlayerStatus.WAITING)) {`
	`233`	`+ if (this.getPlayerStatusMap().get(other).equals(PlayerStatus.WAITING) && this.getStatus().equals(TransactStatus.WAITING)) {`
`231`	`234`	`this.progress();`
`232`	`235`	`}`
`233`	`236`	`return;`
`@@ -360,6 +363,7 @@ private synchronized void addItem(final Player player, final ItemStack itemStack`
`360`	`363`	`private enum TransactStatus {`
`361`	`364`	`WAITING,`
`362`	`365`	`STARTING,`
	`366`	`+ CANCELLED,`
`363`	`367`	`FINISH`
`364`	`368`	`}`
`365`	`369`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void onEnable() {`
`40`	`40`	`}`
`41`	`41`	`TraderPlugin.instance = this;`
`42`	`42`	`try {`
`43`		`- this.fileManager = new FileManager(this, "messages");`
	`43`	`+ this.fileManager = new FileManager(this, "messages", "config");`
`44`	`44`	`} catch (IOException \| InvalidConfigurationException e) {`
`45`	`45`	`this.getLogger().log(Level.SEVERE, ChatColor.translateAlternateColorCodes('&', "§c§lTrading §4§l» §cError while retrieve creating files."));`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+radius: 10 # in blocks`
	`2`	`+expired: 60 # in seconds`