completely forgotten

2 files changed, 14 insertions, 2 deletions

diff --git a/src/me/fatpigsarefat/quests/events/EventInventory.java b/src/me/fatpigsarefat/quests/events/EventInventory.java
index fae87623..e9a1901a 100644
--- a/src/me/fatpigsarefat/quests/events/EventInventory.java
+++ b/src/me/fatpigsarefat/quests/events/EventInventory.java
@@ -34,14 +34,22 @@ public class EventInventory implements Listener {
                 QMenuQuest qMenuQuest = (QMenuQuest) qMenu;
 
                 //TODO check page clicks
+                if (qMenuQuest.getPagePrevLocation() == event.getSlot()) {
+                    buffer.add(event.getWhoClicked().getUniqueId());
+                    event.getWhoClicked().openInventory(qMenuQuest.toInventory(qMenuQuest.getCurrentPage() - 1));
+
+                } else if (qMenuQuest.getPageNextLocation() == event.getSlot()) {
+                    buffer.add(event.getWhoClicked().getUniqueId());
+                    event.getWhoClicked().openInventory(qMenuQuest.toInventory(qMenuQuest.getCurrentPage() + 1));
 
-                if (Options.CATEGORIES_ENABLED.getBooleanValue() && qMenuQuest.getBackButtonLocation() == event.getSlot()) {
+                } else if (Options.CATEGORIES_ENABLED.getBooleanValue() && qMenuQuest.getBackButtonLocation() == event.getSlot()) {
                     QMenuCategory qMenuCategory = qMenuQuest.getSuperMenu();
                     buffer.add(event.getWhoClicked().getUniqueId());
                     event.getWhoClicked().openInventory(qMenuCategory.toInventory(1));
                     tracker.put(event.getWhoClicked().getUniqueId(), qMenuCategory);
 
-                } else if (qMenuQuest.getSlotsToMenu().containsKey(event.getSlot())) {
+                } else if (event.getSlot() < qMenuQuest.getPageSize() && qMenuQuest.getSlotsToMenu().containsKey(event.getSlot() + (((qMenuQuest
+                        .getCurrentPage()) - 1) * qMenuQuest.getPageSize()))) {
                     String questid = qMenuQuest.getSlotsToMenu().get(event.getSlot());
                     Quest quest = Quests.getQuestManager().getQuestById(questid);
                     if (qMenuQuest.getOwner().getQuestProgressFile().startQuest(quest)) {
diff --git a/src/me/fatpigsarefat/quests/events/EventPlayerJoin.java b/src/me/fatpigsarefat/quests/events/EventPlayerJoin.java
index 26805748..14062af0 100644
--- a/src/me/fatpigsarefat/quests/events/EventPlayerJoin.java
+++ b/src/me/fatpigsarefat/quests/events/EventPlayerJoin.java
@@ -1,6 +1,7 @@
 package me.fatpigsarefat.quests.events;
 
 import me.fatpigsarefat.quests.Quests;
+import me.fatpigsarefat.quests.obj.Messages;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -13,6 +14,9 @@ public class EventPlayerJoin implements Listener {
     public void onEvent(PlayerJoinEvent event) {
         UUID playerUuid = event.getPlayer().getUniqueId();
         Quests.getPlayerManager().loadPlayer(playerUuid);
+        if (Quests.getInstance().getDescription().getVersion().contains("beta") && event.getPlayer().hasPermission("quests.admin")) {
+            event.getPlayer().sendMessage(Messages.BETA_REMINDER.getMessage());
+        }
         if (Quests.getUpdater().isUpdateReady() && event.getPlayer().hasPermission("quests.admin")) {
             event.getPlayer().sendMessage(Quests.getUpdater().getMessage());
         }