From ce1a17c0a4c2d83bbeae3316425f6e19e06fd7ff Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 23 Jul 2018 00:14:32 +0100 Subject: [PATCH] Missions bugs --- .../src/mineplex/core/mission/MissionManager.java | 1 + .../src/mineplex/core/mission/MissionPopulator.java | 3 +-- .../src/mineplex/core/mission/MissionTrackerType.java | 1 + .../nautilus/game/arcade/game/games/hideseek/HideSeek.java | 1 + .../nautilus/game/arcade/missions/WalkMissionTracker.java | 7 +++++++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionManager.java b/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionManager.java index a7c77eb6e..137bf29c9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionManager.java @@ -302,6 +302,7 @@ public class MissionManager extends MiniDbClientPlugin player.sendMessage(""); player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, (float) Math.random()); + _statsManager.incrementStat(player, mission.getLength().getStatName(), 1); }); } }); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionPopulator.java b/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionPopulator.java index bc7fb273b..07b356a73 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionPopulator.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionPopulator.java @@ -496,8 +496,7 @@ public class MissionPopulator .description("Shoot %s hunters as a hider") .games(HideSeek) .xRange(10, 20) - .tracker(GAME_DAMAGE_CAUSE) - .trackerData(DamageCause.PROJECTILE) + .tracker(BLOCK_HUNT_SHOOT_HUNTER) .rewards( new LevelExperienceReward(6), new LevelCurrencyReward(GlobalCurrency.GEM, 3), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionTrackerType.java b/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionTrackerType.java index 1628a8543..01cfde95a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionTrackerType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mission/MissionTrackerType.java @@ -46,6 +46,7 @@ public enum MissionTrackerType BLOCK_HUNT_INFEST, BLOCK_HUNT_MEOW, BLOCK_HUNT_FIREWORK, + BLOCK_HUNT_SHOOT_HUNTER, CW_EAT_SLICE, CW_KEEP_CAKE, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java index 3586a0a9d..be52bd24a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java @@ -916,6 +916,7 @@ public class HideSeek extends TeamGame event.AddMod(GetName(), "Constant Damage", -event.GetDamage() + 2, false); event.AddKnockback(GetName(), 2); + Manager.getMissionsManager().incrementProgress(damager, 1, MissionTrackerType.BLOCK_HUNT_SHOOT_HUNTER, GetType().getDisplay(), null); Powerup(damager); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/missions/WalkMissionTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/missions/WalkMissionTracker.java index cd1bdc072..dbbb3157a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/missions/WalkMissionTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/missions/WalkMissionTracker.java @@ -10,6 +10,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerQuitEvent; import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilPlayer; import mineplex.core.mission.MissionTrackerType; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -58,6 +59,12 @@ public class WalkMissionTracker extends GameMissionTracker _last.entrySet().forEach(entry -> { Player player = entry.getKey(); + + if (UtilPlayer.isSpectator(player)) + { + return; + } + Location last = entry.getValue(), now = player.getLocation(); double distance = UtilMath.offset(now, last); ChatColor teamColour = _game.GetTeam(player).GetColor();