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

some more objectives.

Browse Source
This commit is contained in:
Ben 2016-03-18 03:01:11 +00:00
parent 995d454f87
commit 3ba138a8d7
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
View File

@ -928,6 +928,15 @@ public class ClansCommand extends CommandBase<ClansManager>
return;
}
// Event
ClansCommandExecutedEvent event = new ClansCommandExecutedEvent(caller, "tphome");
UtilServer.getServer().getPluginManager().callEvent(event);
if (event.isCancelled())
{
return;
}
DelayedTask.Instance.doDelay(caller, "Home Teleport", new Callback<DelayedTaskClient>() {
public void run(DelayedTaskClient player)
{

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java
View File

@ -17,7 +17,7 @@ public class FieldsObjective extends OrderedObjective<ClansMainTutorial>
addGoal(new GoToFieldsGoal(this)); // IMPLEMENTED
addGoal(new MineDiamondsGoal(this)); // TODO:
addGoal(new KillZombiesGoal(this));
addGoal(new KillZombiesGoal(this)); // IMPLEMENTED
}
@Override

7
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java
View File

@ -10,6 +10,7 @@ import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.ClaimLa
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.ClanDetailsGoal;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.CreateClanGoal;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.SetHomeGoal;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.end.TpClanHomeGoal;
public class FinalObjective extends OrderedObjective<ClansMainTutorial>
{
@ -17,9 +18,9 @@ public class FinalObjective extends OrderedObjective<ClansMainTutorial>
{
super(clansMainTutorial, javaPlugin, "Finishing", "Finalize your knowledge of Clans");
// addGoal(new SellDiamondsGoal(this));
// addGoal(new BuyEnergyGoal(this));
// addGoal(new TpClanHomeGoal(this));
// addGoal(new SellDiamondsGoal(this)); TODO:
// addGoal(new BuyEnergyGoal(this)); TODO:
addGoal(new TpClanHomeGoal(this)); // IMPLEMENTED
}
@Override

8
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java
View File

@ -5,11 +5,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.common.objective.OrderedObjective;
import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.BuildHouseGoal;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.ClaimLandGoal;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.ClanDetailsGoal;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.CreateClanGoal;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.SetHomeGoal;
import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.shops.GoToShopsGoal;
public class ShopsObjective extends OrderedObjective<ClansMainTutorial>
{
@ -17,7 +13,7 @@ public class ShopsObjective extends OrderedObjective<ClansMainTutorial>
{
super(clansMainTutorial, javaPlugin, "Shops", "Learn your way around our shops");
// addGoal(new GoToShopsGoal(this));
addGoal(new GoToShopsGoal(this));
// addGoal(new SellPotatoesGoal(this));
// addGoal(new BuyGearGoal(this));
}

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/KillZombiesGoal.java
View File

@ -49,5 +49,10 @@ public class KillZombiesGoal extends ObjectiveGoal
}
_kills.put(event.getEntity().getKiller().getUniqueId(), Integer.valueOf(_kills.get(event.getEntity().getKiller().getUniqueId()).intValue() + 1));
if (_kills.get(event.getEntity().getKiller().getUniqueId()).intValue() >= 2)
{
finish(event.getEntity().getKiller());
}
}
}