Fix #320

Former-commit-id: e177811
Ghost-chu · Jan 30, 2020 · 7fc879f · 7fc879f
1 parent 81d9d91
commit 7fc879f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.maxgamer</groupId>
     <artifactId>QuickShop</artifactId>
-    <version>3.1.3.4</version>
+    <version>3.1.3.5</version>
 
     <licenses>
         <license>

diff --git a/src/main/java/org/maxgamer/quickshop/Event/ShopDisplayItemDespawnEvent.java b/src/main/java/org/maxgamer/quickshop/Event/ShopDisplayItemDespawnEvent.java
@@ -61,7 +61,7 @@ public ShopDisplayItemDespawnEvent(
    */
   @Deprecated
   public ShopDisplayItemDespawnEvent(@NotNull Shop shop, @NotNull ItemStack itemStack) {
-    this(shop, itemStack, DisplayType.fromID(QuickShop.instance.getConfig().getInt("shop.display-type")));
+    this(shop, itemStack, DisplayItem.getNowUsing());
   }
 
   @Override

diff --git a/src/main/java/org/maxgamer/quickshop/Util/MsgUtil.java b/src/main/java/org/maxgamer/quickshop/Util/MsgUtil.java
@@ -19,6 +19,8 @@
 
 package org.maxgamer.quickshop.Util;
 
+import com.bekvon.bukkit.residence.commands.message;
+import com.bekvon.bukkit.residence.commands.shop;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -151,15 +153,11 @@ public static boolean flush(@NotNull OfflinePlayer p) {
             } catch (ArrayIndexOutOfBoundsException e2) {
               p.getPlayer().sendMessage(msg);
             }
-            plugin.getDatabaseHelper().cleanMessageForPlayer(pName);
-            msgs.clear();
-            return true;
-          } else {
-            return false;
-          }
+            }
         }
         plugin.getDatabaseHelper().cleanMessageForPlayer(pName);
         msgs.clear();
+        return true;
       }
     }
     return false;