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

Turn off the Anniversary activities

This commit is contained in:
Sam 2018-07-28 14:31:52 +01:00 committed by Alexander Meech
parent cc2c847300
commit 8af04af8fd
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,17 +4,10 @@ import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import mineplex.core.Managers;
import mineplex.core.achievement.leveling.rewards.LevelCurrencyReward; import mineplex.core.achievement.leveling.rewards.LevelCurrencyReward;
import mineplex.core.achievement.leveling.rewards.LevelExperienceReward; import mineplex.core.achievement.leveling.rewards.LevelExperienceReward;
import mineplex.core.achievement.leveling.rewards.LevelGadgetReward;
import mineplex.core.achievement.leveling.rewards.LevelTitleReward;
import mineplex.core.common.currency.GlobalCurrency; import mineplex.core.common.currency.GlobalCurrency;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.gadgets.particle.ParticleFiveYear;
import mineplex.core.game.GameDisplay; import mineplex.core.game.GameDisplay;
import mineplex.core.titles.tracks.TrackManager;
import mineplex.core.titles.tracks.award.FiveYearTrack;
import static mineplex.core.game.GameDisplay.*; import static mineplex.core.game.GameDisplay.*;
import static mineplex.core.mission.MissionTrackerType.*; import static mineplex.core.mission.MissionTrackerType.*;
@ -45,16 +38,16 @@ public class MissionPopulator
// ) // )
// .build(); // .build();
MissionContext.newBuilder(manager, 10001) // MissionContext.newBuilder(manager, 10001)
.name("Happy Birthday!") // .name("Happy Birthday!")
.description("Join Mineplex. You've already done it!") // .description("Join Mineplex. You've already done it!")
.event() // .event()
.tracker(LOBBY_JOIN) // .tracker(LOBBY_JOIN)
.rewards( // .rewards(
new LevelGadgetReward(Managers.require(GadgetManager.class).getGadget(ParticleFiveYear.class)), // new LevelGadgetReward(Managers.require(GadgetManager.class).getGadget(ParticleFiveYear.class)),
new LevelTitleReward(Managers.require(TrackManager.class).getTrack(FiveYearTrack.class)) // new LevelTitleReward(Managers.require(TrackManager.class).getTrack(FiveYearTrack.class))
) // )
.build(); // .build();
// Lobby Missions 0-99 // Lobby Missions 0-99

3
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -107,7 +107,6 @@ import mineplex.hub.news.NewsManager;
import mineplex.hub.parkour.ParkourManager; import mineplex.hub.parkour.ParkourManager;
import mineplex.hub.player.CreativeManager; import mineplex.hub.player.CreativeManager;
import mineplex.hub.player.HubPlayerManager; import mineplex.hub.player.HubPlayerManager;
import mineplex.hub.plugin.AnniversaryHubPlugin;
import mineplex.hub.plugin.HubPlugin; import mineplex.hub.plugin.HubPlugin;
import mineplex.hub.scoreboard.HubScoreboard; import mineplex.hub.scoreboard.HubScoreboard;
import mineplex.hub.world.HubPortalManager; import mineplex.hub.world.HubPortalManager;
@ -251,7 +250,7 @@ public class HubManager extends MiniClientPlugin<HubClient> implements IChatMess
_parkourManager = require(ParkourManager.class); _parkourManager = require(ParkourManager.class);
_jumpManager = new JumpManager(this); _jumpManager = new JumpManager(this);
_hubPlugin = new AnniversaryHubPlugin(); _hubPlugin = new HubPlugin();
// Disable chunk generation // Disable chunk generation
nmsWorld.generator = new VoidGenerator(); nmsWorld.generator = new VoidGenerator();

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ExperienceStatTracker.java
View File

@ -19,7 +19,7 @@ import nautilus.game.arcade.game.GemData;
public class ExperienceStatTracker extends StatTracker<Game> public class ExperienceStatTracker extends StatTracker<Game>
{ {
public static final boolean DOUBLE_EXP = true; public static final boolean DOUBLE_EXP = false;
private long _startTime = -1; private long _startTime = -1;
private final Map<String, Long> _playerQuitTime = new HashMap<>(); private final Map<String, Long> _playerQuitTime = new HashMap<>();