mirror of
https://gitlab.com/2009scape/2009scape.git
synced 2025-12-10 10:20:41 -07:00
New Accounts will now automatically join the 2009Scape clan chat (#60)
Renamed the Server's account to '2009Scape' within the members table of the global.sql database The automatic clan chat join can be toggled on or off on the Management Server's ServerConstants.java file Added some text in the TutorialCompletionDialogue.java file to simulate joining the clan once the player has reached the mainland. Added some comments along with my changes to properly denote what is happening. Added spawns for Melee Dummy and Magic Dummy in the Lumbridge Combat Hall in the server.sql database.
This commit is contained in:
Qweqker
Daniel Ginovker
parent
704919d566
commit
b233b0650e
22 changed files with 118 additions and 200 deletions
286
.idea/workspace.xml
generated
286
.idea/workspace.xml
generated
|
|
@ -1,13 +1,30 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="30ea45b9-ec6c-429a-b4dc-a876070cf30e" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/RS-2009.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/artifacts/09Scape_jar.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
||||
<list default="true" id="30ea45b9-ec6c-429a-b4dc-a876070cf30e" name="Default Changelist" comment="New Accounts will now automatically join the 2009Scape clan chat Renamed the Server's account to '2009Scape' within the members table of the global.sql database The automatic clan chat join can be toggled on or off on the Management Server's ServerConstants.java file Added some text in the TutorialCompletionDialogue.java file to simulate joining the clan once the player has reached the mainland. Added some comments to properly denote what is happening. Added spawns for Melee Dummy and Magic Dummy in the Lumbridge Combat Hall in the server.sql database.">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$1.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$2.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$1.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$2.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$3.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$4.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$5.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$5.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$6.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$6.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$7.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$7.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$8.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$8.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/ServerConstants.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/ServerConstants.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/net/packet/WorldPacketRepository.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/net/packet/WorldPacketRepository.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/interaction/inter/GameInterface.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/interaction/inter/GameInterface.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/tutorial/BasicStarter.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/tutorial/BasicStarter.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Management-Server/src/org/keldagrim/ServerConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/Management-Server/src/org/keldagrim/ServerConstants.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Server/global.sql" beforeDir="false" afterPath="$PROJECT_DIR$/Server/global.sql" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Server/server.sql" beforeDir="false" afterPath="$PROJECT_DIR$/Server/server.sql" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Server/src/org/crandor/net/registry/AccountRegister.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/net/registry/AccountRegister.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialCompletionDialogue.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialCompletionDialogue.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
|
|
@ -16,37 +33,6 @@
|
|||
<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$/Management-Server/src/org/keldagrim/Management.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="300">
|
||||
<caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/Server.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="150">
|
||||
<caret line="22" column="19" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/Client/src/org/runite/Client.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="165">
|
||||
<caret line="17" column="52" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
|
|
@ -54,99 +40,21 @@
|
|||
</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_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="master" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
<option name="UPDATE_TYPE" value="MERGE" />
|
||||
</component>
|
||||
<component name="ProjectId" id="1SoCmFrlg0BRp0t2EAHW2CVwxLb" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectView">
|
||||
<navigator proportions="" version="1">
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Client" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Client" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Client" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="runite" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Management-Server" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Management-Server" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Server" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Server" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Server" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="org" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
|
||||
<item name="Server" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="org" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="crandor" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
</panes>
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showExcludedFiles" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="Downloaded.Files.Path.Enabled" value="false" />
|
||||
|
|
@ -164,18 +72,6 @@
|
|||
<property name="restartRequiresConfirmation" value="false" />
|
||||
<property name="settings.editor.selected.configurable" value="editing.templates" />
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
<list>
|
||||
<RuleState>
|
||||
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
||||
</RuleState>
|
||||
<RuleState>
|
||||
<option name="name" value="StatusDashboardGroupingRule" />
|
||||
</RuleState>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Application.GameLaunch">
|
||||
<configuration name="GameLaunch" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="org.runite.GameLaunch" />
|
||||
|
|
@ -232,6 +128,18 @@
|
|||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="ServiceViewManager">
|
||||
<option name="viewStates">
|
||||
<list>
|
||||
<serviceView>
|
||||
<treeState>
|
||||
<expand />
|
||||
<select />
|
||||
</treeState>
|
||||
</serviceView>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
</component>
|
||||
|
|
@ -246,39 +154,6 @@
|
|||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="0" width="1920" height="1036" extended-state="6" />
|
||||
<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.24973376" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info anchor="bottom" id="Version Control" />
|
||||
<window_info anchor="bottom" id="Terminal" />
|
||||
<window_info anchor="bottom" id="Event Log" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Build" weight="0.32969433" />
|
||||
<window_info anchor="bottom" id="Messages" weight="0.32969433" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
<window_info anchor="bottom" id="Find" order="1" />
|
||||
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32969433" />
|
||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
||||
<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="Gradle" />
|
||||
<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	" />
|
||||
<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="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="1" />
|
||||
</component>
|
||||
|
|
@ -288,12 +163,6 @@
|
|||
<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>
|
||||
|
|
@ -315,28 +184,51 @@
|
|||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/Management-Server/src/org/keldagrim/Management.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="300">
|
||||
<caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
|
||||
</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="150">
|
||||
<caret line="22" column="19" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/Client/src/org/runite/Client.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="165">
|
||||
<caret line="17" column="52" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="New Accounts will now automatically join the 2009Scape clan chat Renamed the Server's account to '2009Scape' within the members table of the global.sql database The automatic clan chat join can be toggled on or off on the Management Server's ServerConstants.java file Added some text in the TutorialCompletionDialogue.java file to simulate joining the clan once the player has reached the mainland. Added some comments to properly denote what is happening. Added spawns for Melee Dummy and Magic Dummy in the Lumbridge Combat Hall in the server.sql database." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="New Accounts will now automatically join the 2009Scape clan chat Renamed the Server's account to '2009Scape' within the members table of the global.sql database The automatic clan chat join can be toggled on or off on the Management Server's ServerConstants.java file Added some text in the TutorialCompletionDialogue.java file to simulate joining the clan once the player has reached the mainland. Added some comments to properly denote what is happening. Added spawns for Melee Dummy and Magic Dummy in the Lumbridge Combat Hall in the server.sql database." />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="287" y="0" key="CommitChangelistDialog2" timestamp="1579570487959">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="287" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1579570487959" />
|
||||
<state width="1342" height="198" key="GridCell.Tab.0.bottom" timestamp="1579570400537">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="1342" height="198" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1579570400537" />
|
||||
<state width="1342" height="198" key="GridCell.Tab.0.center" timestamp="1579570400537">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="1342" height="198" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1579570400537" />
|
||||
<state width="1342" height="198" key="GridCell.Tab.0.left" timestamp="1579570400537">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="1342" height="198" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1579570400537" />
|
||||
<state width="1342" height="198" key="GridCell.Tab.0.right" timestamp="1579570400537">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state width="1342" height="198" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1579570400537" />
|
||||
<state x="361" y="146" key="Vcs.Push.Dialog.v2" timestamp="1579570029149">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="361" y="146" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1579570029149" />
|
||||
<state x="470" y="238" key="com.intellij.ide.util.TipDialog" timestamp="1579567566284">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="470" y="238" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1579567566284" />
|
||||
<state x="578" y="330" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1579567802246">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="578" y="330" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.824@0.0.1536.824" timestamp="1579567802246" />
|
||||
<state x="425" y="189" key="run.anything.popup" timestamp="1579569948685">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="425" y="189" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1579569948685" />
|
||||
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1579568599597">
|
||||
<screen x="0" y="0" width="1536" height="824" />
|
||||
</state>
|
||||
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1579568599597" />
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -13,7 +13,7 @@ public final class ServerConstants {
|
|||
/**
|
||||
* The port to be used for communications.
|
||||
*/
|
||||
public static final String SERVER_NAME = "RS 2009";
|
||||
public static final String SERVER_NAME = "2009Scape";
|
||||
|
||||
/**
|
||||
* The port to be used for communications.
|
||||
|
|
@ -35,6 +35,11 @@ public final class ServerConstants {
|
|||
*/
|
||||
public static final String HOST_ADDRESS = "127.0.0.1";
|
||||
|
||||
/**
|
||||
* The setting that determines whether new accounts created will automatically join the Server's default clan chat.
|
||||
*/
|
||||
public static boolean NEW_PLAYER_DEFAULT_CLAN = false;
|
||||
|
||||
/**
|
||||
* The store path.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ CREATE TABLE `members` (
|
|||
--
|
||||
|
||||
INSERT INTO `members` (`UID`, `email`, `username`, `password`, `salt`, `rights`, `email_activated`, `lastActive`, `donatorType`, `donationTotal`, `credits`, `icon`, `perks`, `ip`, `mac`, `serial`, `computerName`, `monthlyVotes`, `netWorth`, `forumUID`, `ironManMode`, `bank`, `inventory`, `equipment`, `ge`, `muteTime`, `banTime`, `profileImage`, `contacts`, `blocked`, `clanName`, `currentClan`, `clanReqs`, `disconnectTime`, `lastWorld`, `chatSettings`, `timePlayed`, `lastLogin`, `lastGameIp`, `countryCode`, `birthday`, `online`, `signature`, `joined_date`, `posts`) VALUES
|
||||
(0, '', 'rs_2009', '$2a$12$P0OU2A5S.lEYdkTq5kq3/u1UlfVkMYIS7WWbxsjjeyfxqTDbygpEe', '$2a$12$P0OU2A5S.lEYdkTq5kq3/u', 2, 0, '2019-11-06 00:29:03', 0, 0.00, 0, 0, '', '127.0.0.1', NULL, NULL, 'SERVER', 0, 0, -1, 'STANDARD', NULL, NULL, NULL, NULL, -1, -1, '', '', '', 'Rs 2009', 'rs_2009', '0,0,8,9', 1572999889084, 1, '0,0,0', NULL, 1572999890885, '127.0.0.1', 0, NULL, 0, NULL, NULL, 0);
|
||||
(0, '', '2009Scape', '$2a$12$P0OU2A5S.lEYdkTq5kq3/u1UlfVkMYIS7WWbxsjjeyfxqTDbygpEe', '$2a$12$P0OU2A5S.lEYdkTq5kq3/u', 2, 0, '2019-11-06 00:29:03', 0, 0.00, 0, 0, '', '127.0.0.1', NULL, NULL, 'SERVER', 0, 0, -1, 'STANDARD', NULL, NULL, NULL, NULL, -1, -1, '', '', '', '2009Scape', '2009Scape', '0,0,8,9', 1572999889084, 1, '0,0,0', NULL, 1572999890885, '127.0.0.1', 0, NULL, 0, NULL, NULL, 0);
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -19623,6 +19623,8 @@ CREATE TABLE `npc_spawns` (
|
|||
--
|
||||
|
||||
INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
|
||||
(4474,'{3214,3252,0,0,0}-{3214,3253,0,0,0}-{3214,3254,0,0,0}');
|
||||
(7891,'{3207,3250,0,0,0}-{3208,3250,0,0,0}-{3209,3250,0,0.0}');
|
||||
(4400, '{3018,10313,0,1,4}-{3016,10315,0,1,4}-{3018,10322,0,1,4}-{3024,10326,0,1,3}-{3030,10332,0,1,4}-{3029,10337,0,1,6}-{3034,10342,0,1,3}-{2072,5200,0,1,7}-{2130,5267,0,1,7}-{2140,5252,0,1,5}-{2141,5252,0,1,1}-{2142,5252,0,1,0}-{2148,5255,0,1,3}-{2125,5270,0,1,1}-{2148,5257,0,1,1}-{2117,5274,0,1,4}-{2146,5307,0,1,2}-{2145,5305,0,1,5}-{2152,5307,0,1,4}-{2148,5252,0,1,0}-{2142,5262,0,1,3}-{2124,5275,0,1,4}-{2121,5276,0,1,3}-{2148,5304,0,1,0}-{2146,5305,0,1,5}-{2148,5304,0,1,1}-{2151,5304,0,1,6}-{2145,5306,0,1,3}-{2134,5272,0,1,6}'),
|
||||
(1, '{3222,3221,0,1,3}-{2804,3427,0,1,2}-{3285,3208,0,1,4}-{3093,3509,0,1,3}-{3098,3508,0,1,7}-{3096,3510,0,1,3}-{3017,3239,0,1,2}-{2712,3484,0,1,4}-{2693,3495,0,1,1}-{3237,3404,0,1,6}-{3237,3408,0,1,0}-{3247,3396,0,1,3}-{3263,3403,0,1,3}-{3210,3223,1,1,4}-{3230,3208,0,1,1}'),
|
||||
(4401, '{2124,5273,0,1,1}-{2072,5200,0,1,6}-{2128,5270,0,1,4}-{2117,5274,0,1,3}-{2154,5273,0,1,3}-{2167,5259,0,1,6}-{2170,5257,0,1,1}-{2170,5256,0,1,0}-{2171,5256,0,1,4}-{2167,5256,0,1,3}-{2153,5273,0,1,3}-{2153,5270,0,1,1}-{2171,5255,0,1,2}-{2168,5250,0,1,4}-{2168,5251,0,1,3}-{2131,5264,0,1,6}-{2096,5248,0,1,6}-{2157,5272,0,1,6}-{2150,5268,0,1,0}-{2133,5272,0,1,2}-{2157,5274,0,1,1}-{2156,5270,0,1,3}-{2154,5271,0,1,5}'),
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import org.crandor.game.system.task.TaskExecutor;
|
|||
import org.crandor.net.Constants;
|
||||
import org.crandor.net.IoSession;
|
||||
import org.crandor.net.event.LoginReadEvent;
|
||||
import org.keldagrim.ServerConstants;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.sql.*;
|
||||
|
|
@ -152,13 +153,21 @@ public class AccountRegister extends SQLEntryHandler<RegistryDetails> {
|
|||
|
||||
@Override
|
||||
public void save() throws SQLException {
|
||||
PreparedStatement statement = getWritingStatement(true, "password", "salt", "birthday", "countryCode", "joined_date");
|
||||
PreparedStatement statement = getWritingStatement(true, "password", "salt", "birthday", "countryCode", "joined_date","currentClan");
|
||||
statement.setString(1, entry.getUsername());
|
||||
statement.setString(2, entry.getPassword());
|
||||
statement.setString(3, entry.getPassword().substring(0, 29));
|
||||
statement.setDate(4, entry.getBirth());
|
||||
statement.setInt(5, entry.getCountry());
|
||||
statement.setTimestamp(6, new Timestamp(System.currentTimeMillis()));
|
||||
|
||||
//If the management server's settings register new users with the server's clan chat
|
||||
//I believe if there was no entry there would be errors during the registration, hence a null entry if the setting is off
|
||||
if (ServerConstants.NEW_PLAYER_DEFAULT_CLAN == true){
|
||||
statement.setString(7,"2009Scape");
|
||||
}else{
|
||||
statement.setString(7,null);
|
||||
}
|
||||
statement.executeUpdate();
|
||||
SQLManager.close(statement.getConnection());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ import org.crandor.game.world.map.Location;
|
|||
import org.crandor.game.world.repository.Repository;
|
||||
import org.crandor.net.amsc.MSPacketRepository;
|
||||
import org.crandor.net.amsc.WorldCommunicator;
|
||||
import org.keldagrim.ServerConstants;
|
||||
import org.runite.GameSetting;
|
||||
|
||||
/**
|
||||
* Handles the tutorial completition dialogue (skippy, magic instructor)
|
||||
|
|
@ -305,6 +307,14 @@ public class TutorialCompletionDialogue extends DialoguePlugin {
|
|||
|
||||
//Appending the welcome message and some other stuff
|
||||
player.getPacketDispatch().sendMessage("Welcome to " + GameWorld.getName() + ".");
|
||||
|
||||
//If the management server's settings register new users with the server's clan chat, we would have to simulate joining a clan
|
||||
if (ServerConstants.NEW_PLAYER_DEFAULT_CLAN == true) {
|
||||
player.getPacketDispatch().sendMessage("Attempting to join channel...:clan:");
|
||||
player.getPacketDispatch().sendMessage("Now talking in clan channel " + ServerConstants.SERVER_NAME + ":clan:");
|
||||
player.getPacketDispatch().sendMessage("To talk, start each line of chat with the / symbol.:clan:");
|
||||
}
|
||||
|
||||
player.unlock();
|
||||
TutorialSession.getExtension(player).setStage(TutorialSession.MAX_STAGE + 1);
|
||||
if (player.getIronmanManager().isIronman() && player.getSettings().isAcceptAid()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue