Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-12 11:21:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix some issues with /questsadmin reload and the new compass code

Browse Source
This commit is contained in:
Nathan Wolf 2015-12-03 10:56:37 -08:00
parent 8e9f002ce1
commit cd4e6dae7a
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/me/blackvein/quests/Quest.java
View File

@ -89,12 +89,7 @@ public class Quest {
if (stageCompleteMessage != null) { if (stageCompleteMessage != null) {
q.getPlayer().sendMessage(Quests.parseString(stageCompleteMessage, this)); q.getPlayer().sendMessage(Quests.parseString(stageCompleteMessage, this));
} }
resetCompass(q);
Location defaultLocation = q.getPlayer().getBedSpawnLocation();
if (defaultLocation == null) {
defaultLocation = q.getPlayer().getWorld().getSpawnLocation();
}
q.getPlayer().setCompassTarget(defaultLocation);
if (q.getCurrentStage(this).delay < 0) { if (q.getCurrentStage(this).delay < 0) {
@ -178,18 +173,39 @@ public class Quest {
public void updateCompass(Quester quester, Stage nextStage) public void updateCompass(Quester quester, Stage nextStage)
{ {
Location targetLocation = null;
if (nextStage == null) {
resetCompass(quester);
return;
}
if (nextStage.citizensToInteract != null && nextStage.citizensToInteract.size() > 0) if (nextStage.citizensToInteract != null && nextStage.citizensToInteract.size() > 0)
{ {
quester.getPlayer().setCompassTarget(plugin.getNPCLocation(nextStage.citizensToInteract.getFirst())); targetLocation = plugin.getNPCLocation(nextStage.citizensToInteract.getFirst());
} }
else if (nextStage.citizensToKill != null && nextStage.citizensToKill.size() > 0) else if (nextStage.citizensToKill != null && nextStage.citizensToKill.size() > 0)
{ {
quester.getPlayer().setCompassTarget(plugin.getNPCLocation(nextStage.citizensToKill.getFirst())); targetLocation = plugin.getNPCLocation(nextStage.citizensToKill.getFirst());
} }
else if (nextStage.locationsToReach != null && nextStage.locationsToReach.size() > 0) else if (nextStage.locationsToReach != null && nextStage.locationsToReach.size() > 0)
{ {
quester.getPlayer().setCompassTarget(nextStage.locationsToReach.getFirst()); targetLocation = nextStage.locationsToReach.getFirst();
} }
if (targetLocation != null) {
quester.getPlayer().setCompassTarget(targetLocation);
} else {
resetCompass(quester);
}
}
protected void resetCompass(Quester q) {
Player player = q.getPlayer();
if (player == null) return;
Location defaultLocation = player.getBedSpawnLocation();
if (defaultLocation == null) {
defaultLocation = player.getWorld().getSpawnLocation();
}
player.setCompassTarget(defaultLocation);
} }
public String getName() { public String getName() {