JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Missions bugs

This commit is contained in:
Sam 2018-07-23 00:14:32 +01:00 committed by Alexander Meech
parent 96da8aa857
commit ce1a17c0a4
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Mineplex.Core/src/mineplex/core/mission/MissionManager.java
View File

@ -302,6 +302,7 @@ public class MissionManager extends MiniDbClientPlugin<MissionClient>
player.sendMessage(""); player.sendMessage("");
player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, (float) Math.random()); player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, (float) Math.random());
_statsManager.incrementStat(player, mission.getLength().getStatName(), 1);
}); });
} }
}); });

3
Plugins/Mineplex.Core/src/mineplex/core/mission/MissionPopulator.java
View File

@ -496,8 +496,7 @@ public class MissionPopulator
.description("Shoot %s hunters as a hider") .description("Shoot %s hunters as a hider")
.games(HideSeek) .games(HideSeek)
.xRange(10, 20) .xRange(10, 20)
.tracker(GAME_DAMAGE_CAUSE) .tracker(BLOCK_HUNT_SHOOT_HUNTER)
.trackerData(DamageCause.PROJECTILE)
.rewards( .rewards(
new LevelExperienceReward(6), new LevelExperienceReward(6),
new LevelCurrencyReward(GlobalCurrency.GEM, 3), new LevelCurrencyReward(GlobalCurrency.GEM, 3),

1
Plugins/Mineplex.Core/src/mineplex/core/mission/MissionTrackerType.java
View File

@ -46,6 +46,7 @@ public enum MissionTrackerType
BLOCK_HUNT_INFEST, BLOCK_HUNT_INFEST,
BLOCK_HUNT_MEOW, BLOCK_HUNT_MEOW,
BLOCK_HUNT_FIREWORK, BLOCK_HUNT_FIREWORK,
BLOCK_HUNT_SHOOT_HUNTER,
CW_EAT_SLICE, CW_EAT_SLICE,
CW_KEEP_CAKE, CW_KEEP_CAKE,

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java
View File

@ -916,6 +916,7 @@ public class HideSeek extends TeamGame
event.AddMod(GetName(), "Constant Damage", -event.GetDamage() + 2, false); event.AddMod(GetName(), "Constant Damage", -event.GetDamage() + 2, false);
event.AddKnockback(GetName(), 2); event.AddKnockback(GetName(), 2);
Manager.getMissionsManager().incrementProgress(damager, 1, MissionTrackerType.BLOCK_HUNT_SHOOT_HUNTER, GetType().getDisplay(), null);
Powerup(damager); Powerup(damager);
} }

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/missions/WalkMissionTracker.java
View File

@ -10,6 +10,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.mission.MissionTrackerType; import mineplex.core.mission.MissionTrackerType;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
@ -58,6 +59,12 @@ public class WalkMissionTracker extends GameMissionTracker<Game>
_last.entrySet().forEach(entry -> _last.entrySet().forEach(entry ->
{ {
Player player = entry.getKey(); Player player = entry.getKey();
if (UtilPlayer.isSpectator(player))
{
return;
}
Location last = entry.getValue(), now = player.getLocation(); Location last = entry.getValue(), now = player.getLocation();
double distance = UtilMath.offset(now, last); double distance = UtilMath.offset(now, last);
ChatColor teamColour = _game.GetTeam(player).GetColor(); ChatColor teamColour = _game.GetTeam(player).GetColor();