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

Merge remote-tracking branch 'origin/clans/beta' into clans/beta

Browse Source
This commit is contained in:
Shaun Bennett 2016-04-04 17:11:15 +10:00
commit 15c4b2dd58
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java
View File

@ -1,5 +1,6 @@
package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.energy;
import mineplex.game.clans.clans.event.ClansCommandPreExecutedEvent;
import mineplex.game.clans.clans.gui.events.ClansButtonClickEvent;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
@ -31,17 +32,7 @@ public class ExplainEnergyGoal extends ObjectiveGoal<EnergyObjective>
@Override
protected void customStart(Player player)
{
ClansManager.getInstance().runSyncLater(() -> {
// Explain Energy
UtilPlayer.message(player, F.main("Clans", "Energy is required to maintain a Clan's territory, without it, any territory that your Clan owns will be claimed by the Wilderness, and anyone will be able to claim that territory. You can buy Energy at the Energy Shop in the Shops."));
player.playSound(player.getLocation(), Sound.NOTE_PLING, 1.0f, 1.0f);
ClansManager.getInstance().runSyncLater(() -> {
finish(player);
}, 20 * 10L);
}, 20 * 3L);
// setStartMessageDelay(120);
player.playSound(player.getLocation(), Sound.NOTE_PLING, 1.0f, 1.0f);
}
@Override
@ -49,6 +40,14 @@ public class ExplainEnergyGoal extends ObjectiveGoal<EnergyObjective>
{
}
@EventHandler
public void onCommand(ClansCommandPreExecutedEvent event)
{
if(contains(event.getPlayer()) && event.getArguments().length == 0)
{
finish(event.getPlayer());
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onClick(ClansButtonClickEvent event) {