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

Store location for teleport home

Browse Source
This commit is contained in:
Shaun Bennett 2016-03-25 13:13:15 +11:00
parent 8afed30c5a
commit 8c7d653cca
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java
View File

@ -276,6 +276,10 @@ public abstract class Tutorial implements Listener, ObjectiveListener
_playerSessionMap.get(player).getHolograms().add(hologram);
hologram.start();
}
}
public TutorialSession getTutorialSession(Player player)
{
return _playerSessionMap.get(player);
}
}

13
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java
View File

@ -3,6 +3,8 @@ package mineplex.game.clans.tutorial;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.Location;
import mineplex.core.hologram.Hologram;
public class TutorialSession
@ -10,6 +12,7 @@ public class TutorialSession
private int _objectiveIndex;
private TutorialRegion _region;
private List<Hologram> _hologramList = new ArrayList<>();
private Location _homeLocation;
public TutorialSession()
{
@ -39,4 +42,14 @@ public class TutorialSession
{
_region = region;
}
public Location getHomeLocation()
{
return _homeLocation;
}
public void setHomeLocation(Location homeLocation)
{
_homeLocation = homeLocation;
}
}

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java
View File

@ -1,5 +1,6 @@
package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -34,6 +35,9 @@ public class SetHomeGoal extends ObjectiveGoal<ClanObjective>
{
if (getObjective().getPlugin().isIn(event.getPlayer(), ClansMainTutorial.Bounds.LAND_CLAIM))
{
// we need to save this for later when the player teleports home!
getObjective().getPlugin().getTutorialSession(event.getPlayer()).setHomeLocation(event.getPlayer().getLocation());
finish(event.getPlayer());
}
else

13
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/end/TpClanHomeGoal.java
View File

@ -3,13 +3,15 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.end;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import mineplex.game.clans.clans.event.ClansCommandPreExecutedEvent;
import mineplex.game.clans.tutorial.objective.Objective;
import mineplex.game.clans.tutorial.objective.ObjectiveGoal;
import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
import mineplex.game.clans.tutorial.tutorials.clans.objective.FinalObjective;
public class TpClanHomeGoal extends ObjectiveGoal
public class TpClanHomeGoal extends ObjectiveGoal<FinalObjective>
{
public TpClanHomeGoal(Objective objective)
public TpClanHomeGoal(FinalObjective objective)
{
super(objective, "Teleport to Clan Home", "Use the /c home command to teleport to your Clan Home");
}
@ -25,9 +27,9 @@ public class TpClanHomeGoal extends ObjectiveGoal
}
@EventHandler
public void teleport(ClansCommandExecutedEvent event)
public void teleport(ClansCommandPreExecutedEvent event)
{
if (!event.getCommand().equals("tphome"))
if (event.getArguments().length != 1 || !event.getArguments()[0].equalsIgnoreCase("home"))
{
return;
}
@ -36,7 +38,8 @@ public class TpClanHomeGoal extends ObjectiveGoal
{
return;
}
event.getPlayer().teleport(getObjective().getPlugin().getTutorialSession(event.getPlayer()).getHomeLocation());
finish(event.getPlayer());
}
}