Merge remote-tracking branch 'origin/develop' into develop

Auxilor · Feb 27, 2023 · 29ce0de · 29ce0de
2 parents fd78402 + 5f65e3f
commit 29ce0de
Showing 1 changed file with 3 additions and 21 deletions.
diff --git a/...in/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopEconomyShopGUI.kt b/...in/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopEconomyShopGUI.kt
@@ -35,35 +35,17 @@ class ShopEconomyShopGUI : ShopIntegration {
     }
 
     object EconomyShopGUISellEventListeners : Listener {
-        private val sellTypes = listOf(
-            "SELL_GUI_SCREEN",
-            "SELL_SCREEN",
-            "SELL_ALL_SCREEN",
-            "SELL_ALL_COMMAND",
-            "QUICK_SELL",
-            "AUTO_SELL_CHEST",
-        )
-
-        private val sellAllTypes = listOf(
-            "SELL_GUI_SCREEN",
-            "SELL_ALL_COMMAND",
-        )
-
         @EventHandler
         fun shopEventToEcoEvent(event: PreTransactionEvent) {
-            if (event.transactionType.name.uppercase() !in sellTypes) {
+            if (!event.transactionType.mode.equals(Transaction.Mode.SELL.name, true)) {
                 return
             }
 
             if (event.isCancelled) {
                 return
             }
 
-            val prices = if (event.transactionType.name.uppercase() in sellAllTypes) {
-                event.items!!
-            } else {
-                mapOf(event.shopItem to event.amount)
-            }
+            val prices = event.items ?: mapOf(event.shopItem to event.amount)
 
             var total = 0.0
 
@@ -83,4 +65,4 @@ class ShopEconomyShopGUI : ShopIntegration {
     override fun getPluginName(): String {
         return "EconomyShopGUI"
     }
-}
+}