fix: Some events that were not functional in the old version

blank038 · Dec 2, 2023 · 00934a5 · 00934a5
1 parent e73e2b1
commit 00934a5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/src/main/java/com/blank038/servermarket/ServerMarket.java b/src/main/java/com/blank038/servermarket/ServerMarket.java
@@ -10,8 +10,10 @@
 import com.blank038.servermarket.data.DataContainer;
 import com.blank038.servermarket.i18n.I18n;
 import com.blank038.servermarket.listen.impl.CoreListener;
-import com.blank038.servermarket.listen.impl.PlayerListener;
+import com.blank038.servermarket.listen.impl.PlayerCommonListener;
+import com.blank038.servermarket.listen.impl.PlayerLatestListener;
 import com.blank038.servermarket.metrics.Metrics;
+import de.tr7zw.nbtapi.utils.MinecraftVersion;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.Bukkit;
@@ -44,7 +46,10 @@ public void onEnable() {
         super.getCommand("servermarket").setExecutor(new MainCommand(this));
         // 注册事件监听类
         new CoreListener().register();
-        new PlayerListener().register();
+        new PlayerCommonListener().register();
+        if (MinecraftVersion.isAtLeastVersion(MinecraftVersion.MC1_13_R1)) {
+            new PlayerLatestListener().register();
+        }
         // start tasks
         Bukkit.getScheduler().runTaskTimerAsynchronously(this, storageHandler::removeTimeOutItem, 200L, 200L);
         Bukkit.getScheduler().runTaskTimerAsynchronously(this, storageHandler::saveAll, 1200L, 1200L);

diff --git a/...vermarket/listen/impl/PlayerListener.java → ...ket/listen/impl/PlayerCommonListener.java b/...vermarket/listen/impl/PlayerListener.java → ...ket/listen/impl/PlayerCommonListener.java
@@ -9,7 +9,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerCommandSendEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
@@ -21,7 +20,7 @@
  * @author Blank038
  * @date 2021/03/05
  */
-public class PlayerListener extends AbstractListener {
+public class PlayerCommonListener extends AbstractListener {
 
     /**
      * 玩家加入服务器事件
@@ -52,18 +51,13 @@ public void onPlayerQuit(PlayerQuitEvent event) {
         });
     }
 
-    @EventHandler
-    public void onPlayerCommandSend(PlayerCommandSendEvent event) {
-        event.getCommands().addAll(DataContainer.REGISTERED_COMMAND);
-    }
-
     private synchronized void checkResult(Player player) {
         ServerMarket.getStorageHandler().getOfflineTransactionByPlayer(player.getUniqueId()).forEach((k, v) -> {
             if (ServerMarket.getStorageHandler().removeOfflineTransaction(k)) {
                 // 获取市场数据
                 MarketData marketData = DataContainer.MARKET_DATA.getOrDefault(v.getSourceMarket(), null);
                 // 获取可获得货币
-                double price = v.getAmount(), last = marketData == null ? price : marketData.getLastMoney(marketData.getTaxSection(), player, price);
+                double price = v.getAmount(), last = marketData == null ? price : (price - price * marketData.getPermsValueForPlayer(marketData.getTaxSection(), player));
                 // 判断货币桥是否存在
                 if (BaseEconomy.PAY_TYPES.containsKey(v.getPayType())) {
                     DecimalFormat df = new DecimalFormat("#0.00");

diff --git a/src/main/java/com/blank038/servermarket/listen/impl/PlayerLatestListener.java b/src/main/java/com/blank038/servermarket/listen/impl/PlayerLatestListener.java
@@ -0,0 +1,19 @@
+package com.blank038.servermarket.listen.impl;
+
+import com.blank038.servermarket.data.DataContainer;
+import com.blank038.servermarket.listen.AbstractListener;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandSendEvent;
+
+/**
+ * @author Blank038
+ */
+public class PlayerLatestListener extends AbstractListener
+        implements Listener {
+
+    @EventHandler
+    public void onPlayerCommandSend(PlayerCommandSendEvent event) {
+        event.getCommands().addAll(DataContainer.REGISTERED_COMMAND);
+    }
+}