3.4.2B型

特定の時間以外で報酬を受け取れなくなるシステムに合わせて修正

Author: miyabi033

pom.xml

@@ -6,7 +6,7 @@
   <groupId>net.azisaba</groupId>
   <artifactId>LeonGunWar</artifactId>
 
-  <version>3.4.2</version>
+  <version>3.4.2B</version>
 
   <name>${project.artifactId}</name>
   <description>A core plugin in Azisaba LeonGunWar</description>

src/main/java/net/azisaba/lgw/core/KillStreaks.java

@@ -77,27 +77,25 @@ private void giveRewards(int streaks, Player player) {
             .forEach(command -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command));
     }
 
-    public void add(Player player) {
+    public void add(Player killer, Player deader) {
         // カウントを追加
-        int streaks = get(player).incrementAndGet();
+        int streaks = get(killer).incrementAndGet();
 
         // 報酬を付与
         if(LeonGunWar.doubleRewardEnable){
-            giveRewards(streaks, player);
+            giveRewards(streaks, killer);
         }
-        giveRewards(streaks, player);
+
 
         if (LeonGunWar.getPlugin().getManager().getMatchMode()
             == MatchMode.LEADER_DEATH_MATCH_POINT) {
-            if (LeonGunWar.getPlugin().getManager().getLDMLeaderMap().containsValue(player)) {
-                if(LeonGunWar.doubleRewardEnable){
-                    player.sendMessage(
-                            Chat.f("{0}&7あなたはリーダーなので &e2倍 &7の報酬を受け取りました!(報酬ブーストは適用されていません)", LeonGunWar.GAME_PREFIX));
-                }else {
-                    player.sendMessage(
-                            Chat.f("{0}&7あなたはリーダーなので &e2倍 &7の報酬を受け取りました！", LeonGunWar.GAME_PREFIX));
-                    giveRewards(streaks, player);
-                }
+            if (LeonGunWar.getPlugin().getManager().getLDMLeaderMap().containsValue(killer)) {
+                killer.sendMessage(
+                        Chat.f("{0}&7あなたはリーダーなので &e3倍 &7の報酬を受け取りました！", LeonGunWar.GAME_PREFIX));
+                giveRewards(streaks, killer);
+                giveRewards(streaks, killer);
+                giveRewards(streaks, killer);
+
             }
         }
 
@@ -107,7 +105,7 @@ public void add(Player player) {
             .map(Map.Entry::getValue)
             .map(Map.Entry::getKey)
             .flatMap(List::stream)
-            .map(message -> Chat.f(message, LeonGunWar.GAME_PREFIX, player.getPlayerListName()))
+            .map(message -> Chat.f(message, LeonGunWar.GAME_PREFIX, killer.getPlayerListName()))
             .forEach(BroadcastUtils::broadcast);
         LeonGunWar.getPlugin().getKillStreaksConfig().getTimeConditionedStreaks().entrySet()
             .stream()
@@ -118,14 +116,14 @@ public void add(Player player) {
             .map(Map.Entry::getValue)
             .map(Map.Entry::getKey)
             .flatMap(List::stream)
-            .map(message -> Chat.f(message, LeonGunWar.GAME_PREFIX, player.getPlayerListName()))
+            .map(message -> Chat.f(message, LeonGunWar.GAME_PREFIX, killer.getPlayerListName()))
             .forEach(BroadcastUtils::broadcast);
         LeonGunWar.getPlugin().getKillStreaksConfig().getLevels().entrySet().stream()
             .filter(entry -> streaks % entry.getKey() == 0)
             .map(Map.Entry::getValue)
             .map(Map.Entry::getKey)
             .flatMap(List::stream)
-            .map(message -> Chat.f(message, LeonGunWar.GAME_PREFIX, player.getPlayerListName()))
+            .map(message -> Chat.f(message, LeonGunWar.GAME_PREFIX, killer.getPlayerListName()))
             .forEach(BroadcastUtils::broadcast);
         LeonGunWar.getPlugin().getKillStreaksConfig().getTimeConditionedLevels().entrySet().stream()
             .filter(entry -> entry.getKey().isDuring())
@@ -135,7 +133,7 @@ public void add(Player player) {
             .map(Map.Entry::getValue)
             .map(Map.Entry::getKey)
             .flatMap(List::stream)
-            .map(message -> Chat.f(message, LeonGunWar.GAME_PREFIX, player.getPlayerListName()))
+            .map(message -> Chat.f(message, LeonGunWar.GAME_PREFIX, killer.getPlayerListName()))
             .forEach(BroadcastUtils::broadcast);
     }
 }

src/main/java/net/azisaba/lgw/core/listeners/others/StreaksListener.java

@@ -33,7 +33,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
         }
 
         // カウントを追加
-        LeonGunWar.getPlugin().getKillStreaks().add(killer);
+        LeonGunWar.getPlugin().getKillStreaks().add(killer,deader);
     }
 
     @EventHandler

src/main/java/net/azisaba/lgw/core/util/ClockMachine.java

@@ -18,17 +18,17 @@ public void doubleRewardTaskStarter(){
     }
 
     private void doubleRewardStartTask(){
-        Bukkit.getServer().broadcast(Component.text("-+----時限報酬ブースト開始！----+-").color(NamedTextColor.AQUA).decorate(TextDecoration.BOLD));
+        Bukkit.getServer().broadcast(Component.text("-+----報酬取得可能状態になりました！----+-").color(NamedTextColor.AQUA).decorate(TextDecoration.BOLD));
         LeonGunWar.doubleRewardEnable = true;
     }
     private void doubleRewardEndTask(){
-        Bukkit.getServer().broadcast(Component.text("-+----時限報酬ブースト終了...----+-").color(NamedTextColor.AQUA).decorate(TextDecoration.BOLD));
+        Bukkit.getServer().broadcast(Component.text("-+----報酬取得可能時間が終了しました...----+-").color(NamedTextColor.AQUA).decorate(TextDecoration.BOLD));
         LeonGunWar.doubleRewardEnable = false;
     }
 
     public static boolean isWithinRewardTime() {
         LocalTime now = LocalTime.now(); // 現在時刻（システム時刻）
-        LocalTime start = LocalTime.of(18, 0); // 14:00
+        LocalTime start = LocalTime.of(7, 0); // 14:00
         LocalTime end = LocalTime.of(23, 59);   // 18:00
 
         return !now.isBefore(start) && !now.isAfter(end);