v3.1.1 - Bug fixes

Realizedd · Realizedd · commit 7ef60d15c6e0 · 2018-07-30T18:40:22.000+09:00
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 
 allprojects {
     group 'me.realized'
-    version '3.1.0'
+    version '3.1.1'
 }
 
 subprojects {
diff --git a/duels-plugin/src/main/java/me/realized/duels/arena/Arena.java b/duels-plugin/src/main/java/me/realized/duels/arena/Arena.java
@@ -5,7 +5,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
@@ -163,7 +162,7 @@ public void remove(final Player player) {
     }
 
     public int size() {
-        return isUsed() ? match.getAllPlayers().size() : 0;
+        return isUsed() ? match.getAlivePlayers().size() : 0;
     }
 
     public Player first() {
diff --git a/duels-plugin/src/main/java/me/realized/duels/command/commands/duels/subcommands/AddsignCommand.java b/duels-plugin/src/main/java/me/realized/duels/command/commands/duels/subcommands/AddsignCommand.java
@@ -47,7 +47,7 @@ protected void execute(final CommandSender sender, final String label, final Str
             return;
         }
 
-        if (!queueManager.create(sign, kit, bet)) {
+        if (!queueManager.create(sign.getLocation(), kit, bet)) {
             lang.sendMessage(sender, "ERROR.sign.already-exists");
             return;
         }
diff --git a/duels-plugin/src/main/java/me/realized/duels/command/commands/duels/subcommands/DeletesignCommand.java b/duels-plugin/src/main/java/me/realized/duels/command/commands/duels/subcommands/DeletesignCommand.java
@@ -28,7 +28,7 @@ protected void execute(final CommandSender sender, final String label, final Str
             return;
         }
 
-        final QueueSign queueSign = queueManager.remove(sign);
+        final QueueSign queueSign = queueManager.remove(sign.getLocation());
 
         if (queueSign == null) {
             lang.sendMessage(sender, "ERROR.sign.not-found");
diff --git a/duels-plugin/src/main/java/me/realized/duels/data/ItemData.java b/duels-plugin/src/main/java/me/realized/duels/data/ItemData.java
@@ -73,7 +73,7 @@ public ItemData(final ItemStack item) {
                         + (potion.isSplash() ? "splash-" : "")
                         + (potion.isStrong() ? "strong-" : "");
                 }
-            } else if (CompatUtil.isPre_1_13() && material.equals("MONSTER_EGG")) {
+            } else if (CompatUtil.isPre1_13() && material.equals("MONSTER_EGG")) {
                 final SpawnEggs spawnEgg = SpawnEggs.fromItemStack(item);
 
                 if (spawnEgg != null) {
@@ -188,7 +188,7 @@ public ItemStack toItemStack() {
         if (!CompatUtil.isPre1_9() && itemData != null) {
             if (material.contains("POTION")) {
                 item = new Potions(PotionType.valueOf(args.get(0)), args).toItemStack(amount);
-            } else if (CompatUtil.isPre_1_13() && material.equals("MONSTER_EGG")) {
+            } else if (CompatUtil.isPre1_13() && material.equals("MONSTER_EGG")) {
                 item = new SpawnEggs(EntityType.valueOf(args.get(0))).toItemStack(amount);
             }
         }
diff --git a/duels-plugin/src/main/java/me/realized/duels/data/QueueSignData.java b/duels-plugin/src/main/java/me/realized/duels/data/QueueSignData.java
@@ -13,7 +13,7 @@ public class QueueSignData {
     private final int bet;
 
     public QueueSignData(final QueueSign queue) {
-        this.location = new LocationData(queue.getSign().getLocation());
+        this.location = new LocationData(queue.getLocation());
         this.kit = queue.getKit() != null ? queue.getKit().getName() : null;
         this.bet = queue.getBet();
     }
@@ -31,7 +31,7 @@ public QueueSign toQueueSign(final DuelsPlugin plugin) {
             return null;
         }
 
-        return new QueueSign((Sign) block.getState(), plugin.getLang().getMessage("SIGN.format",
+        return new QueueSign(location, plugin.getLang().getMessage("SIGN.format",
             "kit", kit != null ? kit : "none", "bet_amount", bet), kit != null ? plugin.getKitManager().get(kit) : null, bet);
     }
-}
+}
diff --git a/duels-plugin/src/main/java/me/realized/duels/extra/PotionListener.java b/duels-plugin/src/main/java/me/realized/duels/extra/PotionListener.java
@@ -32,7 +32,7 @@ public void on(final PlayerItemConsumeEvent event) {
 
         final ItemStack item = event.getItem();
 
-        if (item.getType().name().endsWith("POTION")) {
+        if (!item.getType().name().endsWith("POTION")) {
             return;
         }
 
diff --git a/duels-plugin/src/main/java/me/realized/duels/queue/QueueManager.java b/duels-plugin/src/main/java/me/realized/duels/queue/QueueManager.java
@@ -40,7 +40,7 @@
 import me.realized.duels.util.inventory.InventoryUtil;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.bukkit.block.BlockState;
+import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -57,7 +57,7 @@ public class QueueManager implements Loadable, Listener {
     private final UserManager userManager;
     private final DuelManager duelManager;
     private final File file;
-    private final Map<Sign, QueueSign> signs = new HashMap<>();
+    private final Map<Location, QueueSign> signs = new HashMap<>();
     private final Map<QueueSign, LinkedList<QueueEntry>> queues = new HashMap<>();
 
     private CombatTagPlusHook combatTagPlus;
@@ -94,8 +94,7 @@ public void handleLoad() throws Exception {
                         final QueueSign queueSign = queueSignData.toQueueSign(plugin);
 
                         if (queueSign != null) {
-                            final Sign sign = queueSign.getSign();
-                            signs.put(sign, queueSign);
+                            signs.put(queueSign.getLocation(), queueSign);
                         }
                     });
                 }
@@ -187,12 +186,12 @@ public void handleUnload() throws Exception {
         queues.clear();
     }
 
-    public QueueSign get(final Sign sign) {
-        return signs.get(sign);
+    public QueueSign get(final Location location) {
+        return signs.get(location);
     }
 
-    public QueueSign remove(final Sign sign) {
-        final QueueSign queueSign = signs.remove(sign);
+    public QueueSign remove(final Location location) {
+        final QueueSign queueSign = signs.remove(location);
 
         if (queueSign != null && signs.values().stream().noneMatch(s -> s.equals(queueSign))) {
             final Queue<QueueEntry> queue = queues.remove(queueSign);
@@ -227,14 +226,14 @@ public Queue<QueueEntry> get(final QueueSign sign) {
         return queues.computeIfAbsent(sign, result -> new LinkedList<>());
     }
 
-    public boolean create(final Sign sign, final Kit kit, final int bet) {
-        if (get(sign) != null) {
+    public boolean create(final Location location, final Kit kit, final int bet) {
+        if (get(location) != null) {
             return false;
         }
 
         final QueueSign created;
         final String kitName = kit != null ? kit.getName() : "none";
-        signs.put(sign, created = new QueueSign(sign, lang.getMessage("SIGN.format", "kit", kitName, "bet_amount", bet), kit, bet));
+        signs.put(location, created = new QueueSign(location, lang.getMessage("SIGN.format", "kit", kitName, "bet_amount", bet), kit, bet));
 
         final Queue<QueueEntry> queue = get(created);
         signs.values().stream().filter(queueSign -> queueSign.equals(created)).forEach(queueSign -> queueSign.setCount(queue.size()));
@@ -247,14 +246,14 @@ public Collection<QueueSign> getSigns() {
 
     @EventHandler
     public void on(final PlayerInteractEvent event) {
-        final BlockState state;
+        final Block block;
 
-        if (!event.hasBlock() || !((state = event.getClickedBlock().getState()) instanceof Sign)) {
+        if (!event.hasBlock() || !((block = event.getClickedBlock()).getState() instanceof Sign)) {
             return;
         }
 
         final Player player = event.getPlayer();
-        final QueueSign sign = get((Sign) state);
+        final QueueSign sign = get(block.getLocation());
 
         if (sign == null) {
             return;
@@ -313,15 +312,9 @@ public void on(final PlayerInteractEvent event) {
 
     @EventHandler(ignoreCancelled = true)
     public void on(final BlockBreakEvent event) {
-        final BlockState state = event.getBlock().getState();
+        final Block block = event.getBlock();
 
-        if (!(state instanceof Sign)) {
-            return;
-        }
-
-        final Sign sign = (Sign) state;
-
-        if (get(sign) == null) {
+        if (!(block.getState() instanceof Sign) || get(block.getLocation()) == null) {
             return;
         }
 
diff --git a/duels-plugin/src/main/java/me/realized/duels/queue/QueueSign.java b/duels-plugin/src/main/java/me/realized/duels/queue/QueueSign.java
@@ -4,21 +4,23 @@
 import lombok.Getter;
 import me.realized.duels.kit.Kit;
 import me.realized.duels.util.StringUtil;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
 
 public class QueueSign {
 
     @Getter
-    private final Sign sign;
+    private final Location location;
     @Getter
     private final String[] lines;
     @Getter
     private final Kit kit;
     @Getter
     private final int bet;
 
-    public QueueSign(final Sign sign, final String format, final Kit kit, final int bet) {
-        this.sign = sign;
+    public QueueSign(final Location location, final String format, final Kit kit, final int bet) {
+        this.location = location;
         this.kit = kit;
         this.bet = bet;
 
@@ -30,6 +32,15 @@ public QueueSign(final Sign sign, final String format, final Kit kit, final int
         }
 
         this.lines = data;
+
+        final Block block = location.getBlock();
+
+        if (!(block.getState() instanceof Sign)) {
+            return;
+        }
+
+        final Sign sign = (Sign) block.getState();
+
         sign.setLine(0, replace(lines[0], 0));
         sign.setLine(1, replace(lines[1], 0));
         sign.setLine(2, replace(lines[2], 0));
@@ -42,6 +53,13 @@ private String replace(final String line, final int count) {
     }
 
     public void setCount(final int count) {
+        final Block block = location.getBlock();
+
+        if (!(block.getState() instanceof Sign)) {
+            return;
+        }
+
+        final Sign sign = (Sign) block.getState();
         sign.setLine(0, replace(lines[0], count));
         sign.setLine(1, replace(lines[1], count));
         sign.setLine(2, replace(lines[2], count));
@@ -64,6 +82,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return (kit != null ? kit.getName() : "none") + " - $" + bet + " - " + StringUtil.parse(sign.getLocation());
+        return (kit != null ? kit.getName() : "none") + " - $" + bet + " - " + StringUtil.parse(location);
     }
 }
diff --git a/duels-plugin/src/main/java/me/realized/duels/util/compat/CompatBase.java b/duels-plugin/src/main/java/me/realized/duels/util/compat/CompatBase.java
@@ -71,7 +71,7 @@ class CompatBase {
         PLAYER_CONNECTION = ReflectionUtil.getField(NMS_PLAYER, "playerConnection");
         SEND_PACKET = ReflectionUtil.getMethod(ReflectionUtil.getNMSClass("PlayerConnection"), "sendPacket", ReflectionUtil.getNMSClass("Packet"));
 
-        COLLIDES_WITH_ENTITIES = CompatUtil.isPre_1_10() ? ReflectionUtil.getField(NMS_PLAYER, "collidesWithEntities") : null;
+        COLLIDES_WITH_ENTITIES = CompatUtil.isPre1_10() ? ReflectionUtil.getField(NMS_PLAYER, "collidesWithEntities") : null;
 
         GET_ONLINE_PLAYERS = ReflectionUtil.getMethod(Bukkit.class, "getOnlinePlayers");
 
diff --git a/duels-plugin/src/main/java/me/realized/duels/util/compat/CompatUtil.java b/duels-plugin/src/main/java/me/realized/duels/util/compat/CompatUtil.java
@@ -14,11 +14,11 @@ public final class CompatUtil {
 
     private CompatUtil() {}
 
-    public static boolean isPre_1_13() {
+    public static boolean isPre1_13() {
         return SUB_VERSION < 13;
     }
 
-    public static boolean isPre_1_10() {
+    public static boolean isPre1_10() {
         return SUB_VERSION < 10;
     }
 
diff --git a/duels-plugin/src/main/java/me/realized/duels/util/compat/Items.java b/duels-plugin/src/main/java/me/realized/duels/util/compat/Items.java
@@ -22,18 +22,18 @@ public final class Items {
     public static final Material EMPTY_MAP;
 
     static {
-        ORANGE_PANE = (CompatUtil.isPre_1_13() ? ItemBuilder.of(PANE, 1, (short) 1) : ItemBuilder.of(Material.ORANGE_STAINED_GLASS_PANE)).name(" ").build();
-        BLUE_PANE = (CompatUtil.isPre_1_13() ? ItemBuilder.of(PANE, 1, (short) 11) : ItemBuilder.of(Material.BLUE_STAINED_GLASS_PANE)).name(" ").build();
-        RED_PANE = (CompatUtil.isPre_1_13() ? ItemBuilder.of(PANE, 1, (short) 14) : ItemBuilder.of(Material.RED_STAINED_GLASS_PANE)).build();
-        GRAY_PANE = (CompatUtil.isPre_1_13() ? ItemBuilder.of(PANE, 1, (short) 7) : ItemBuilder.of(Material.GRAY_STAINED_GLASS_PANE)).build();
-        WHITE_PANE = (CompatUtil.isPre_1_13() ? ItemBuilder.of(PANE, 1, (short) 0) : ItemBuilder.of(Material.WHITE_STAINED_GLASS_PANE)).build();
-        GREEN_PANE = (CompatUtil.isPre_1_13() ? ItemBuilder.of(PANE, 1, (short) 5) : ItemBuilder.of(Material.LIME_STAINED_GLASS_PANE)).build();
-        HEAD = (CompatUtil.isPre_1_13() ? ItemBuilder.of("SKULL_ITEM", 1, (short) 3) : ItemBuilder.of(Material.PLAYER_HEAD)).build();
-        SKELETON_HEAD = CompatUtil.isPre_1_13() ? Material.matchMaterial("SKULL_ITEM") : Material.SKELETON_SKULL;
-        OFF = (CompatUtil.isPre_1_13() ? ItemBuilder.of("INK_SACK", 1, (short) 8) : ItemBuilder.of(Material.GRAY_DYE)).build();
-        ON = (CompatUtil.isPre_1_13() ? ItemBuilder.of("INK_SACK", 1, (short) 10) : ItemBuilder.of(Material.LIME_DYE)).build();
-        MUSHROOM_SOUP = CompatUtil.isPre_1_13() ? Material.matchMaterial("MUSHROOM_SOUP") : Material.MUSHROOM_STEW;
-        EMPTY_MAP = CompatUtil.isPre_1_13() ? Material.matchMaterial("EMPTY_MAP") : Material.MAP;
+        ORANGE_PANE = (CompatUtil.isPre1_13() ? ItemBuilder.of(PANE, 1, (short) 1) : ItemBuilder.of(Material.ORANGE_STAINED_GLASS_PANE)).name(" ").build();
+        BLUE_PANE = (CompatUtil.isPre1_13() ? ItemBuilder.of(PANE, 1, (short) 11) : ItemBuilder.of(Material.BLUE_STAINED_GLASS_PANE)).name(" ").build();
+        RED_PANE = (CompatUtil.isPre1_13() ? ItemBuilder.of(PANE, 1, (short) 14) : ItemBuilder.of(Material.RED_STAINED_GLASS_PANE)).build();
+        GRAY_PANE = (CompatUtil.isPre1_13() ? ItemBuilder.of(PANE, 1, (short) 7) : ItemBuilder.of(Material.GRAY_STAINED_GLASS_PANE)).build();
+        WHITE_PANE = (CompatUtil.isPre1_13() ? ItemBuilder.of(PANE, 1, (short) 0) : ItemBuilder.of(Material.WHITE_STAINED_GLASS_PANE)).build();
+        GREEN_PANE = (CompatUtil.isPre1_13() ? ItemBuilder.of(PANE, 1, (short) 5) : ItemBuilder.of(Material.LIME_STAINED_GLASS_PANE)).build();
+        HEAD = (CompatUtil.isPre1_13() ? ItemBuilder.of("SKULL_ITEM", 1, (short) 3) : ItemBuilder.of(Material.PLAYER_HEAD)).build();
+        SKELETON_HEAD = CompatUtil.isPre1_13() ? Material.matchMaterial("SKULL_ITEM") : Material.SKELETON_SKULL;
+        OFF = (CompatUtil.isPre1_13() ? ItemBuilder.of("INK_SACK", 1, (short) 8) : ItemBuilder.of(Material.GRAY_DYE)).build();
+        ON = (CompatUtil.isPre1_13() ? ItemBuilder.of("INK_SACK", 1, (short) 10) : ItemBuilder.of(Material.LIME_DYE)).build();
+        MUSHROOM_SOUP = CompatUtil.isPre1_13() ? Material.matchMaterial("MUSHROOM_SOUP") : Material.MUSHROOM_STEW;
+        EMPTY_MAP = CompatUtil.isPre1_13() ? Material.matchMaterial("EMPTY_MAP") : Material.MAP;
     }
 
     public static boolean equals(final ItemStack item, final ItemStack other) {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ buildscript {`
`10`	`10`
`11`	`11`	`allprojects {`
`12`	`12`	`group 'me.realized'`
`13`		`- version '3.1.0'`
	`13`	`+ version '3.1.1'`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`import java.util.HashSet;`
`6`	`6`	`import java.util.List;`
`7`	`7`	`import java.util.Map;`
`8`		`-import java.util.Map.Entry;`
`9`	`8`	`import java.util.Objects;`
`10`	`9`	`import java.util.Set;`
`11`	`10`	`import java.util.UUID;`
`@@ -163,7 +162,7 @@ public void remove(final Player player) {`
`163`	`162`	`}`
`164`	`163`
`165`	`164`	`public int size() {`
`166`		`- return isUsed() ? match.getAllPlayers().size() : 0;`
	`165`	`+ return isUsed() ? match.getAlivePlayers().size() : 0;`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`public Player first() {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected void execute(final CommandSender sender, final String label, final Str`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`	`49`
`50`		`- if (!queueManager.create(sign, kit, bet)) {`
	`50`	`+ if (!queueManager.create(sign.getLocation(), kit, bet)) {`
`51`	`51`	`lang.sendMessage(sender, "ERROR.sign.already-exists");`
`52`	`52`	`return;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected void execute(final CommandSender sender, final String label, final Str`
`28`	`28`	`return;`
`29`	`29`	`}`
`30`	`30`
`31`		`- final QueueSign queueSign = queueManager.remove(sign);`
	`31`	`+ final QueueSign queueSign = queueManager.remove(sign.getLocation());`
`32`	`32`
`33`	`33`	`if (queueSign == null) {`
`34`	`34`	`lang.sendMessage(sender, "ERROR.sign.not-found");`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public ItemData(final ItemStack item) {`
`73`	`73`	`+ (potion.isSplash() ? "splash-" : "")`
`74`	`74`	`+ (potion.isStrong() ? "strong-" : "");`
`75`	`75`	`}`
`76`		`- } else if (CompatUtil.isPre_1_13() && material.equals("MONSTER_EGG")) {`
	`76`	`+ } else if (CompatUtil.isPre1_13() && material.equals("MONSTER_EGG")) {`
`77`	`77`	`final SpawnEggs spawnEgg = SpawnEggs.fromItemStack(item);`
`78`	`78`
`79`	`79`	`if (spawnEgg != null) {`
`@@ -188,7 +188,7 @@ public ItemStack toItemStack() {`
`188`	`188`	`if (!CompatUtil.isPre1_9() && itemData != null) {`
`189`	`189`	`if (material.contains("POTION")) {`
`190`	`190`	`item = new Potions(PotionType.valueOf(args.get(0)), args).toItemStack(amount);`
`191`		`- } else if (CompatUtil.isPre_1_13() && material.equals("MONSTER_EGG")) {`
	`191`	`+ } else if (CompatUtil.isPre1_13() && material.equals("MONSTER_EGG")) {`
`192`	`192`	`item = new SpawnEggs(EntityType.valueOf(args.get(0))).toItemStack(amount);`
`193`	`193`	`}`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class QueueSignData {`
`13`	`13`	`private final int bet;`
`14`	`14`
`15`	`15`	`public QueueSignData(final QueueSign queue) {`
`16`		`- this.location = new LocationData(queue.getSign().getLocation());`
	`16`	`+ this.location = new LocationData(queue.getLocation());`
`17`	`17`	`this.kit = queue.getKit() != null ? queue.getKit().getName() : null;`
`18`	`18`	`this.bet = queue.getBet();`
`19`	`19`	`}`
`@@ -31,7 +31,7 @@ public QueueSign toQueueSign(final DuelsPlugin plugin) {`
`31`	`31`	`return null;`
`32`	`32`	`}`
`33`	`33`
`34`		`- return new QueueSign((Sign) block.getState(), plugin.getLang().getMessage("SIGN.format",`
	`34`	`+ return new QueueSign(location, plugin.getLang().getMessage("SIGN.format",`
`35`	`35`	`"kit", kit != null ? kit : "none", "bet_amount", bet), kit != null ? plugin.getKitManager().get(kit) : null, bet);`
`36`	`36`	`}`
`37`		`-}`
	`37`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void on(final PlayerItemConsumeEvent event) {`
`32`	`32`
`33`	`33`	`final ItemStack item = event.getItem();`
`34`	`34`
`35`		`- if (item.getType().name().endsWith("POTION")) {`
	`35`	`+ if (!item.getType().name().endsWith("POTION")) {`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`