From 5e3d85718db94c007e6eb27c47c78b8343aed9be Mon Sep 17 00:00:00 2001
From: dginovker <dcress01@uoguelph.ca>
Date: Sat, 2 Nov 2019 17:24:01 -0400
Subject: [PATCH] mikeysasse merge prep

---
 .gitignore                                    |   1 +
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           | 579 +++++++++++++++++-
 .../.settings/org.eclipse.jdt.core.prefs      |   6 +-
 .../09Scape/data/eco/grand_exchange_db.emp    | Bin 138082 -> 138082 bytes
 .../09Scape/org/crandor/ServerConstants.class | Bin 5760 -> 5654 bytes
 .../crandor/net/event/LoginReadEvent.class    | Bin 6598 -> 6598 bytes
 .../dialogue/PhantuwtiFantstuwiFarSight.class | Bin 3348 -> 3284 bytes
 Server/data/eco/grand_exchange_db.emp         | Bin 138082 -> 138082 bytes
 Server/src/org/crandor/ServerConstants.java   |   4 +-
 .../org/crandor/net/event/LoginReadEvent.java |   3 +-
 .../dialogue/PhantuwtiFantstuwiFarSight.java  |   6 +-
 Server/src/plugin/tutorial/BasicStarter.java  |  42 ++
 13 files changed, 608 insertions(+), 35 deletions(-)
 create mode 100644 Server/src/plugin/tutorial/BasicStarter.java

diff --git a/.gitignore b/.gitignore
index 81d3c139b..d237473ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 production/*
 .idea/*
+.idea/
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dc3ff8543..048d263df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_222 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/CompiledServer" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3379e2de6..7b25f4a7e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="0dbfe935-8085-4dde-9815-06f8b3761458" name="Default Changelist" comment="" />
+    <list default="true" id="0dbfe935-8085-4dde-9815-06f8b3761458" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/ServerConstants.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/ServerConstants.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/data/eco/grand_exchange_db.emp" beforeDir="false" afterPath="$PROJECT_DIR$/Server/data/eco/grand_exchange_db.emp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -11,24 +23,196 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/PlayerDetails.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="561">
+              <caret line="385" column="19" selection-start-line="385" selection-start-column="19" selection-end-line="385" selection-end-column="19" />
+              <folding>
+                <element signature="e#6796#6797#0" expanded="true" />
+                <element signature="e#6819#6820#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/portal/PlayerSQLManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="329">
+              <caret line="91" selection-start-line="91" selection-end-line="91" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="527">
+              <caret line="31" column="70" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#591#592#0" expanded="true" />
+                <element signature="e#618#619#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="452">
+              <caret line="71" column="50" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="50" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="422">
+              <caret line="57" column="7" lean-forward="true" selection-start-line="57" selection-start-column="7" selection-end-line="57" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="540">
+              <caret line="85" column="22" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/link/TeleportManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="63" column="83" selection-start-line="63" selection-start-column="83" selection-end-line="63" selection-end-column="83" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/item/StarterPackPlugin.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="442">
+              <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/guild/RangingGuildPlugin.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="40">
+              <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/player/LoginValidationPlugin.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="321">
+              <caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>tutorial</find>
+      <find>login</find>
+      <find>starter</find>
+      <find>setlastlogin</find>
+      <find>HOME</find>
+      <find>home teleport</find>
+      <find>mystical foresig</find>
+    </findStrings>
+    <dirStrings>
+      <dir>C:\Users\Michael\Desktop\rsps_trash\rs2009\Server\src\plugin\interaction\item</dir>
+    </dirStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java" />
+        <option value="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java" />
+        <option value="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-7" />
+    <option name="width" value="1294" />
+    <option name="height" value="1407" />
+  </component>
   <component name="ProjectId" id="1SoCmFrlg0BRp0t2EAHW2CVwxLb" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="rs2009" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="rs2009" type="462c0819:PsiDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="rs2009" type="462c0819:PsiDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+              <item name="tutorial" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+    </panes>
+  </component>
   <component name="PropertiesComponent">
     <property name="Downloaded.Files.Path.Enabled" value="false" />
     <property name="Repository.Attach.Annotations" value="false" />
     <property name="Repository.Attach.JavaDocs" value="false" />
     <property name="Repository.Attach.Sources" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/Server/data" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="org.runite" />
-    </key>
+    <property name="restartRequiresConfirmation" value="false" />
+    <property name="settings.editor.selected.configurable" value="editing.templates" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -43,19 +227,6 @@
     </option>
   </component>
   <component name="RunManager" selected="Application.Server">
-    <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="org.runite.Client" />
-      <module name="09Scape" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="org.runite.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="GameLaunch" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.runite.GameLaunch" />
       <module name="09Scape" />
@@ -100,12 +271,10 @@
       <item itemvalue="Application.Management" />
       <item itemvalue="Application.Server" />
       <item itemvalue="Application.GameLaunch" />
-      <item itemvalue="Application.Client" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Application.Server" />
-        <item itemvalue="Application.Client" />
         <item itemvalue="Application.GameLaunch" />
         <item itemvalue="Application.Management" />
       </list>
@@ -124,17 +293,383 @@
     </task>
     <servers />
   </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Image Layers" />
+      <window_info id="Designer" />
+      <window_info id="UI Designer" />
+      <window_info id="Capture Tool" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18004769" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Version Control" weight="0.32969603" />
+      <window_info anchor="bottom" id="Terminal" weight="0.32969603" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" weight="0.32967034" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info active="true" anchor="bottom" id="Find" order="1" visible="true" weight="0.32969603" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3289166" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3998441" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="right" id="Maven" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
         <entry key="MAIN">
           <value>
             <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
               <option name="COLUMN_ORDER" />
             </State>
           </value>
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/system/mysql/SQLManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/system/script/ScriptCompiler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="302">
+          <caret line="86" column="37" lean-forward="true" selection-start-line="86" selection-start-column="37" selection-end-line="86" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/Server.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="419">
+          <caret line="40" column="7" lean-forward="true" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/travel/glider/Gliders.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-292">
+          <caret line="30" column="7" lean-forward="true" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/travel/glider/GliderPulse.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="79">
+          <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/skill/free/cooking/CookingPulse.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="453">
+          <caret line="52" column="60" lean-forward="true" selection-start-line="52" selection-start-column="60" selection-end-line="52" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/inter/LoginInterfacePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="495">
+          <caret line="37" column="39" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/state/StateManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-708">
+          <caret line="21" column="35" lean-forward="true" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="321">
+          <caret line="71" column="31" selection-start-line="71" selection-start-column="31" selection-end-line="71" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialCompletionDialogue.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="442">
+          <caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialIslandPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="510">
+          <caret line="46" column="65" lean-forward="true" selection-start-line="46" selection-start-column="65" selection-end-line="46" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="93" column="18" lean-forward="true" selection-start-line="93" selection-start-column="18" selection-end-line="93" selection-end-column="18" />
+          <folding>
+            <element signature="e#27874#27875#0" expanded="true" />
+            <element signature="e#27898#27899#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2159">
+          <caret line="149" column="7" lean-forward="true" selection-start-line="149" selection-start-column="7" selection-end-line="149" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/tools/PlayerLoader.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/tools/firewatch/Firewatch.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BrotherBraceDialogue.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/object/ShootingStarPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="142">
+          <caret line="228" column="41" selection-start-line="228" selection-start-column="41" selection-end-line="228" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/plugin/PluginManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="278">
+          <caret line="161" column="53" selection-start-line="161" selection-start-column="53" selection-end-line="161" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/npc/DoomsayerTogglePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="17" selection-start-line="17" selection-end-line="17" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/consumable/PotionPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="28" column="31" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/plugin/InitializablePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/barrows/BarrowsActivityPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="40" selection-start-line="40" selection-end-line="40" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/guild/RangingGuildPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="40">
+          <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/item/StarterPackPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="442">
+          <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/portal/PlayerSQLManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="329">
+          <caret line="91" selection-start-line="91" selection-end-line="91" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/PlayerDetails.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="561">
+          <caret line="385" column="19" selection-start-line="385" selection-start-column="19" selection-end-line="385" selection-end-column="19" />
+          <folding>
+            <element signature="e#6796#6797#0" expanded="true" />
+            <element signature="e#6819#6820#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/player/LoginValidationPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="321">
+          <caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="527">
+          <caret line="31" column="70" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#591#592#0" expanded="true" />
+            <element signature="e#618#619#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="452">
+          <caret line="71" column="50" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/link/TeleportManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="63" column="83" selection-start-line="63" selection-start-column="83" selection-end-line="63" selection-end-column="83" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="422">
+          <caret line="57" column="7" lean-forward="true" selection-start-line="57" selection-start-column="7" selection-end-line="57" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="85" column="22" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>09Scape</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
   </component>
 </project>
\ No newline at end of file
diff --git a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs b/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs
index a698e5967..d17b6724d 100644
--- a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs
+++ b/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp b/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp
index 5661ec662610c11f55724e880bae8ae5a861de59..5a21fe783a458ddb0b5ffb81a6fb86e6c9775734 100644
GIT binary patch
delta 25
gcmaE~jpNZa4h{we#ym038=j3EtsIP7IhdlP0dFY>LjV8(

delta 25
gcmaE~jpNZa4h{we#_S+<zw}0qRu0Ck986Kt0B)QIE&u=k

diff --git a/CompiledServer/production/09Scape/org/crandor/ServerConstants.class b/CompiledServer/production/09Scape/org/crandor/ServerConstants.class
index 05aa2a0dc5d808f0696a50546b22ee73ddb2d81c..282903351b67ae426575555f0baf84832a54bc90 100644
GIT binary patch
literal 5654
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

literal 5760
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
ZGz=v>VK})I#*-^xJ88a$^xNRd{{Y>3fKLDb

diff --git a/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class b/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class
index dcc5fe1f51bf47aa07227220c5df47c04f57edac..2fc5c0a4d41ed3c6f572868444ab512d48e1cb5e 100644
GIT binary patch
delta 89
zcmX?Re9U-5oVa8M10O>tgD^uEgCRpVgE>PFgFQnZgA2oi$>ri5f-@Lc7-lkXGt6QT
s0@4x;b0!N&ERb9Z6j{a~$grG2j9~?XG{Z^;MTS)jjtpxipOp9u0Mj)VEdT%j

delta 89
zcmX?Re9U-5oVa8s10O>dgD^ukgCRo?gE>PlgFQn(gA2pN$>ri5f-@Od7-lhWGt6cX
s0@4x;b0-T(ERb9V6j{z7$gqMzjA12%G{Y(eMTXT3jtpxjpOp9u0M=#}KmY&$

diff --git a/CompiledServer/production/09Scape/plugin/dialogue/PhantuwtiFantstuwiFarSight.class b/CompiledServer/production/09Scape/plugin/dialogue/PhantuwtiFantstuwiFarSight.class
index c49d6b6711b1eb24435de9cc6e148c138ca50add..255b54951c83ce74556ba1d50992484ad2b0bd53 100644
GIT binary patch
delta 306
zcmXAkUn_%g6vsd3ak2J1M$1YR&r`N~dT#w`W@aH)GK~=Ox5;Yn0auHQDgC?wZq!_m
zM7fY$DYv`<Qj~Y##@U=Y=kq<CQ|Ek7I$t}kKEs77A(}uQgBw~esE6EZ2{j~)D{aj$
zO-E;K%9t{(>{jk5U1e42D{oE4KC^f;?{*+H6LEaA;UvU06{onjTVG{>97#%~*k_0e
zX%5M7$_VFVsWHkEV?68W7bf^%l5eK?VOm<qON<$5ryxmYWtch1GA~;!NQp%$vm^&B
z%MmMb%&J_oCU>l>p-p+9I7pA4_x}A7C!w7>r<XpYq54%>`XEG!{E~A$&+D=R-&{6t
F{{io(HM9T#

delta 335
zcmXBQ&nrYx6u|NCc@}t2l#KH8y%_a+3mZ&AOpKxY8YVO*<j0h3X38HhTUjVQHk5^(
zD3YBGWu=tD#(ow^nb_Gl#;tQc=XTHH-1AhkTYH`>P25vV5y+Q!NyQ0&M?N%_6iOIX
zO^r_tOW*3$Dm9`8)U?{D?yI(Xt-9)~A2N>&!GAG5dG@oGE2n;|6_kMQTAt>(wVK_c
zN!vrj=p;iIn{=~H4?Fa7Odn^2xuBmr26!OCBT?QNBF_llj7c@)QqP3gOiGw386+;l
zOv^eml3`XhNXQ;@azIiJnU^aT<c3ALWl3@@N9Bzb{cTF}tkJBaIRCpKNQ>TdE40y$
a6siub3>_9KDgPm6JC4&}c&_KC%Tm9}@jhYz

diff --git a/Server/data/eco/grand_exchange_db.emp b/Server/data/eco/grand_exchange_db.emp
index af4a1aa516be7c74c9f8913db8346dc080478a4e..5a21fe783a458ddb0b5ffb81a6fb86e6c9775734 100644
GIT binary patch
delta 25
gcmaE~jpNZa4h{we#ym038=j3EtsIP7IhdlP0dFY>LjV8(

delta 25
hcmaE~jpNZa4h{we#yr_Cn>RIbv~n<R<zR}E1^|9R2zdYi

diff --git a/Server/src/org/crandor/ServerConstants.java b/Server/src/org/crandor/ServerConstants.java
index c4a973ab1..c1260fcd7 100644
--- a/Server/src/org/crandor/ServerConstants.java
+++ b/Server/src/org/crandor/ServerConstants.java
@@ -48,12 +48,12 @@ public final class ServerConstants {
 	/**
 	 * The start location for a fresh account.
 	 */
-	public static final Location START_LOCATION = Location.create(3088, 3491, 0);
+	public static final Location START_LOCATION = Location.create(3232, 3231, 0);
 	
 	/**
 	 * The main home teleport location.
 	 */
-	public static final Location HOME_LOCATION = Location.create(3088, 3491, 0);
+	public static final Location HOME_LOCATION = Location.create(3221, 3218, 0);
 	
 	/**
 	 * The teleport destinations.
diff --git a/Server/src/org/crandor/net/event/LoginReadEvent.java b/Server/src/org/crandor/net/event/LoginReadEvent.java
index 0338e3df2..a048300c1 100644
--- a/Server/src/org/crandor/net/event/LoginReadEvent.java
+++ b/Server/src/org/crandor/net/event/LoginReadEvent.java
@@ -127,8 +127,7 @@ public final class LoginReadEvent extends IoReadEvent {
 
 	/**
 	 * Handles the login procedure after we check an acc is registered & certified.
-	 * @param username the username.
-	 * @param password the password.
+	 * @param details the player details.
 	 * @param session the session.
 	 * @param buffer the byte buffer.
 	 * @param opcode the opcode.
diff --git a/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java b/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java
index 2b0836362..30dfc9b2c 100644
--- a/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java
+++ b/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java
@@ -83,11 +83,7 @@ public final class PhantuwtiFantstuwiFarSight extends DialoguePlugin {
 			break;
 		case 20:
 			interpreter.sendDialogues(npc, FacialExpression.NORMAL, "A lot of our time is spent adressing everyday sorts of", "things, plus we meditate a lot and ehhance our", "powers of mystical foresight.");
-			stage = 21;
-			break;
-		case 21:
-			interpreter.sendDialogues(npc, FacialExpression.NORMAL, "A lot of our time is spent adressing everyday sorts of", "things, plus we meditate a lot and ehhance our", "powers of mystical foresight.");
-			stage = 21;
+			stage = 31;
 			break;
 		case 30:
 			interpreter.sendDialogues(npc, FacialExpression.NORMAL, "Unfortunately no, sorry, but if adventure is what you", "seek, try checking through your quest list!");
diff --git a/Server/src/plugin/tutorial/BasicStarter.java b/Server/src/plugin/tutorial/BasicStarter.java
new file mode 100644
index 000000000..2191d06e0
--- /dev/null
+++ b/Server/src/plugin/tutorial/BasicStarter.java
@@ -0,0 +1,42 @@
+package plugin.tutorial;
+
+import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.node.item.Item;
+import org.crandor.plugin.InitializablePlugin;
+import org.crandor.plugin.Plugin;
+import org.crandor.plugin.PluginManifest;
+import org.crandor.plugin.PluginType;
+
+/**
+ * Basic starter until tutorial is completed.
+ *
+ * @author Michael Sasse (https://github.com/mikeysasse/)
+ */
+@InitializablePlugin
+@PluginManifest(type = PluginType.LOGIN)
+public class BasicStarter implements Plugin<Player> {
+
+    private static final int[][] STARTER_ITEMS = { { 1351, 1 }, { 590, 1 },
+            { 303, 1 }, { 315, 1 }, { 1925, 1 }, { 1931, 1 }, { 2309, 1 },
+            { 1265, 1 }, { 1205, 1 }, { 1277, 1 }, { 1171, 1 }, { 841, 1 },
+            { 882, 25 }, { 556, 25 }, { 558, 15 }, { 555, 6 }, { 557, 4 },
+            { 559, 2 } };
+
+    public BasicStarter() { }
+
+    @Override
+    public Plugin<Player> newInstance(Player player) throws Throwable {
+        System.out.println(player.getDetails().getLastLogin());
+        if (player.getDetails().getLastLogin() == 0) {
+            for (int[] item : STARTER_ITEMS) {
+                player.getInventory().add(new Item(item[0], item[1]));
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public Object fireEvent(String identifier, Object... args) {
+        return null;
+    }
+}