From 02fbddb261b46b9b5ba27a416b471058fb81eef4 Mon Sep 17 00:00:00 2001 From: CodeForFame Date: Fri, 13 May 2011 02:58:13 -0500 Subject: [PATCH 1/6] modified: .gitignore Added some more things... modified: GameServer/build.xml modified: LoginServer/build.xml Added a name to it... new file: GameServer/compile.sh new file: GameServer/run_server.sh new file: LoginServer/compile.sh new file: LoginServer/runls.sh For Linux users --- .gitignore | 9 ++++++++- CREDITS | 2 +- GameServer/build.xml | 2 +- GameServer/compile.sh | 1 + GameServer/run_server.sh | 1 + LoginServer/build.xml | 2 +- LoginServer/compile.sh | 1 + LoginServer/runls.sh | 1 + 8 files changed, 15 insertions(+), 4 deletions(-) create mode 100755 GameServer/compile.sh create mode 100755 GameServer/run_server.sh create mode 100755 LoginServer/compile.sh create mode 100755 LoginServer/runls.sh diff --git a/.gitignore b/.gitignore index e17622b..ebcdc21 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,11 @@ *.ipr *.iws *.iml -*.class \ No newline at end of file +*.class +bin +build +.* +!.gitignore +!.gitmodules +!.gitkeep +!.gitattributes diff --git a/CREDITS b/CREDITS index a2766a9..87ab738 100644 --- a/CREDITS +++ b/CREDITS @@ -9,4 +9,4 @@ Reines Sean stork xEnt -zerrentar \ No newline at end of file +zerrentar diff --git a/GameServer/build.xml b/GameServer/build.xml index 8a3ae73..74d56b2 100644 --- a/GameServer/build.xml +++ b/GameServer/build.xml @@ -1,4 +1,4 @@ - + diff --git a/GameServer/compile.sh b/GameServer/compile.sh new file mode 100755 index 0000000..59b09c9 --- /dev/null +++ b/GameServer/compile.sh @@ -0,0 +1 @@ +ant diff --git a/GameServer/run_server.sh b/GameServer/run_server.sh new file mode 100755 index 0000000..1585b0d --- /dev/null +++ b/GameServer/run_server.sh @@ -0,0 +1 @@ +ant runf2p diff --git a/LoginServer/build.xml b/LoginServer/build.xml index f6643e9..a2e74a8 100644 --- a/LoginServer/build.xml +++ b/LoginServer/build.xml @@ -1,4 +1,4 @@ - + diff --git a/LoginServer/compile.sh b/LoginServer/compile.sh new file mode 100755 index 0000000..68879e8 --- /dev/null +++ b/LoginServer/compile.sh @@ -0,0 +1 @@ +ant compile diff --git a/LoginServer/runls.sh b/LoginServer/runls.sh new file mode 100755 index 0000000..eb73d0f --- /dev/null +++ b/LoginServer/runls.sh @@ -0,0 +1 @@ +ant runls From ea668ae747d9594d0be8dd352c15b1fe3fa4c1e3 Mon Sep 17 00:00:00 2001 From: CodeForFame Date: Fri, 13 May 2011 03:24:42 -0500 Subject: [PATCH 2/6] Changed some configs, and changed the package. --- GameServer/build.xml | 186 +----- GameServer/conf/ls/FPacketHandlers.xml | 12 +- GameServer/conf/ls/LSPacketHandlers.xml | 28 +- GameServer/conf/ls/aliases.xml | 2 +- GameServer/conf/server/Conf.xml | 14 - GameServer/conf/server/LSPacketHandlers.xml | 24 +- GameServer/conf/server/NpcHandlers.xml | 24 +- GameServer/conf/server/PacketHandlers.xml | 84 +-- GameServer/conf/server/aliases.xml | 80 +-- GameServer/conf/server/locs/GameObjectLoc.xml | 2 +- GameServer/conf/server/locs/NpcLoc.xml | 60 +- .../conf/server/quests_back/Christmas.java | 22 +- .../server/quests_back/CooksAssistant.java | 12 +- .../conf/server/quests_back/ImpCatcher.java | 16 +- .../conf/server/quests_back/SheepShearer.java | 14 +- .../server/quests_back/VampireSlayer.java | 12 +- GameServer/rscd.jar | Bin 737907 -> 737934 bytes .../116 - Wyson the Gardener.bsh.svn-base | 2 +- .../.svn/text-base/142 - Barmaid.bsh.svn-base | 2 +- .../176 - Brother Jered.bsh.svn-base | 2 +- .../.svn/text-base/194 - Ned.bsh.svn-base | 4 +- .../scripts/116 - Wyson the Gardener.bsh | 2 +- GameServer/scripts/142 - Barmaid.bsh | 2 +- GameServer/scripts/176 - Brother Jered.bsh | 2 +- GameServer/scripts/194 - Ned.bsh | 8 +- .../scripts/496 - Community Instructor.bsh | 6 +- GameServer/src/msc/config/Constants.java | 127 ---- .../src/msc/gs/npchandler/NpcHandler.java | 8 - .../gs/plugins/listeners/ItemListener.java | 5 - .../plugins/listeners/ItemOnItemListener.java | 5 - .../listeners/ItemOnObjectListener.java | 5 - .../msc/gs/plugins/listeners/NpcListener.java | 5 - GameServer/src/msc/gs/util/Processor.java | 7 - .../moparscape}/msc/config/Config.java | 2 +- .../org/moparscape/msc/config/Constants.java | 142 ++++ .../moparscape}/msc/config/Formulae.java | 39 +- .../moparscape}/msc/gs/CacheHandler.java | 7 +- .../{ => org/moparscape}/msc/gs/Instance.java | 14 +- .../{ => org/moparscape}/msc/gs/Server.java | 24 +- .../GameObjectPositionPacketBuilder.java | 13 +- .../builders/ItemPositionPacketBuilder.java | 13 +- .../msc/gs/builders/LSPacketBuilder.java | 10 +- .../msc/gs/builders/MiscPacketBuilder.java | 27 +- .../gs/builders/NpcPositionPacketBuilder.java | 13 +- .../gs/builders/NpcUpdatePacketBuilder.java | 11 +- .../builders/PlayerPositionPacketBuilder.java | 11 +- .../builders/PlayerUpdatePacketBuilder.java | 19 +- .../msc/gs/builders/RSCPacketBuilder.java | 4 +- .../msc/gs/builders/StaticPacketBuilder.java | 6 +- .../WallObjectPositionPacketBuilder.java | 13 +- .../ls/GameSettingUpdatePacketBuilder.java | 8 +- .../msc/gs/builders/ls/MiscPacketBuilder.java | 30 +- .../ls/PlayerInfoRequestPacketBuilder.java | 12 +- .../ls/PlayerListRequestPacketBuilder.java | 14 +- .../ls/PrivacySettingUpdatePacketBuilder.java | 8 +- .../ls/ReportInfoRequestPacketBuilder.java | 12 +- .../msc/gs/builders/ls/SavePacketBuilder.java | 18 +- .../builders/ls/StatRequestPacketBuilder.java | 12 +- .../msc/gs/connection}/LSCodecFactory.java | 2 +- .../gs/connection/LSConnectionHandler.java | 10 +- .../msc/gs/connection/LSPacket.java | 2 +- .../msc/gs/connection/LSProtocolDecoder.java | 2 +- .../msc/gs/connection/LSProtocolEncoder.java | 4 +- .../moparscape}/msc/gs/connection/Packet.java | 4 +- .../msc/gs/connection/PacketQueue.java | 2 +- .../msc/gs/connection/RSCCodecFactory.java | 2 +- .../gs/connection/RSCConnectionHandler.java | 14 +- .../msc/gs/connection/RSCPacket.java | 2 +- .../msc/gs/connection/RSCProtocolDecoder.java | 4 +- .../msc/gs/connection/RSCProtocolEncoder.java | 6 +- .../msc/gs/core/ClientUpdater.java | 43 +- .../msc/gs/core/DelayedEventHandler.java | 13 +- .../moparscape}/msc/gs/core/GameEngine.java | 46 +- .../msc/gs/core/LoginConnector.java | 20 +- .../moparscape}/msc/gs/db/DBConnection.java | 7 +- .../msc/gs/db/ReportHandlerQueries.java | 22 +- .../msc/gs/event/DelayedEvent.java | 10 +- .../msc/gs/event/DelayedQuestChat.java | 8 +- .../moparscape}/msc/gs/event/DuelEvent.java | 11 +- .../moparscape}/msc/gs/event/FightEvent.java | 25 +- .../moparscape}/msc/gs/event/MiniEvent.java | 4 +- .../msc/gs/event/ObjectRemover.java | 10 +- .../moparscape}/msc/gs/event/RangeEvent.java | 29 +- .../moparscape}/msc/gs/event/ShortEvent.java | 4 +- .../moparscape}/msc/gs/event/SingleEvent.java | 4 +- .../msc/gs/event/WalkMobToMobEvent.java | 10 +- .../msc/gs/event/WalkToMobEvent.java | 6 +- .../msc/gs/event/WalkToObjectEvent.java | 6 +- .../msc/gs/event/WalkToPointEvent.java | 6 +- .../msc/gs/external/AgilityCourseDef.java | 2 +- .../msc/gs/external/AgilityDef.java | 2 +- .../moparscape}/msc/gs/external/CertDef.java | 2 +- .../msc/gs/external/CerterDef.java | 2 +- .../moparscape}/msc/gs/external/DoorDef.java | 2 +- .../msc/gs/external/EntityDef.java | 2 +- .../msc/gs/external/EntityHandler.java | 9 +- .../msc/gs/external/FiremakingDef.java | 2 +- .../msc/gs/external/GameObjectDef.java | 2 +- .../msc/gs/external/GameObjectLoc.java | 2 +- .../msc/gs/external/ItemArrowHeadDef.java | 2 +- .../msc/gs/external/ItemBowStringDef.java | 2 +- .../msc/gs/external/ItemCookingDef.java | 2 +- .../msc/gs/external/ItemCraftingDef.java | 2 +- .../msc/gs/external/ItemDartTipDef.java | 2 +- .../moparscape}/msc/gs/external/ItemDef.java | 2 +- .../msc/gs/external/ItemDropDef.java | 2 +- .../msc/gs/external/ItemGemDef.java | 2 +- .../msc/gs/external/ItemHerbDef.java | 2 +- .../msc/gs/external/ItemHerbSecond.java | 2 +- .../moparscape}/msc/gs/external/ItemLoc.java | 2 +- .../msc/gs/external/ItemLogCutDef.java | 2 +- .../msc/gs/external/ItemSmeltingDef.java | 2 +- .../msc/gs/external/ItemSmithingDef.java | 2 +- .../msc/gs/external/ItemUnIdentHerbDef.java | 2 +- .../msc/gs/external/ItemWieldableDef.java | 2 +- .../moparscape}/msc/gs/external/NPCDef.java | 2 +- .../moparscape}/msc/gs/external/NPCLoc.java | 2 +- .../msc/gs/external/ObjectFishDef.java | 2 +- .../msc/gs/external/ObjectFishingDef.java | 2 +- .../msc/gs/external/ObjectMiningDef.java | 2 +- .../msc/gs/external/ObjectWoodcuttingDef.java | 2 +- .../msc/gs/external/PrayerDef.java | 2 +- .../msc/gs/external/ReqOreDef.java | 2 +- .../moparscape}/msc/gs/external/SpellDef.java | 2 +- .../moparscape}/msc/gs/external/TileDef.java | 2 +- .../moparscape}/msc/gs/io/WorldLoader.java | 37 +- .../moparscape}/msc/gs/model/ActiveTile.java | 9 +- .../moparscape}/msc/gs/model/Bank.java | 2 +- .../moparscape}/msc/gs/model/Bubble.java | 2 +- .../moparscape}/msc/gs/model/ChatMessage.java | 4 +- .../moparscape}/msc/gs/model/Entity.java | 8 +- .../moparscape}/msc/gs/model/GameObject.java | 10 +- .../moparscape}/msc/gs/model/InvItem.java | 14 +- .../moparscape}/msc/gs/model/Inventory.java | 5 +- .../moparscape}/msc/gs/model/Item.java | 14 +- .../moparscape}/msc/gs/model/MenuHandler.java | 2 +- .../moparscape}/msc/gs/model/Mob.java | 16 +- .../moparscape}/msc/gs/model/Npc.java | 29 +- .../moparscape}/msc/gs/model/Path.java | 2 +- .../msc/gs/model/PathGenerator.java | 4 +- .../moparscape}/msc/gs/model/PathHandler.java | 4 +- .../moparscape}/msc/gs/model/Player.java | 50 +- .../msc/gs/model/PlayerAppearance.java | 6 +- .../moparscape}/msc/gs/model/Point.java | 6 +- .../moparscape}/msc/gs/model/Projectile.java | 2 +- .../moparscape}/msc/gs/model/Script.java | 7 +- .../moparscape}/msc/gs/model/Sector.java | 2 +- .../moparscape}/msc/gs/model/Shop.java | 9 +- .../moparscape}/msc/gs/model/Syndicate.java | 5 +- .../moparscape}/msc/gs/model/TelePoint.java | 2 +- .../moparscape}/msc/gs/model/Tile.java | 2 +- .../moparscape}/msc/gs/model/TileValue.java | 2 +- .../moparscape}/msc/gs/model/ViewArea.java | 5 +- .../moparscape}/msc/gs/model/World.java | 39 +- .../moparscape}/msc/gs/model/mini/Cache.java | 2 +- .../msc/gs/model/mini/Damager.java | 4 +- .../msc/gs/model/snapshot/Activity.java | 4 +- .../msc/gs/model/snapshot/Chatlog.java | 5 +- .../msc/gs/model/snapshot/Snapshot.java | 2 +- .../moparscape}/msc/gs/npchandler/Aggie.java | 22 +- .../msc/gs/npchandler/Apothecary.java | 18 +- .../msc/gs/npchandler/Bananas.java | 18 +- .../msc/gs/npchandler/Bankers.java | 14 +- .../moparscape}/msc/gs/npchandler/Boat.java | 18 +- .../moparscape}/msc/gs/npchandler/Certer.java | 22 +- .../msc/gs/npchandler/EntranaMonks.java | 16 +- .../msc/gs/npchandler/KebabSeller.java | 18 +- .../msc/gs/npchandler/MakeOverMage.java | 16 +- .../msc/gs/npchandler/MonkHealer.java | 16 +- .../msc/gs/npchandler/NpcHandler.java | 8 + .../msc/gs/npchandler/NpcHandlerDef.java | 2 +- .../msc/gs/npchandler/OtherNPC.java | 16 +- .../msc/gs/npchandler/ShopKeeper.java | 26 +- .../msc/gs/npchandler/ShopKeeper.java.1 | 0 .../moparscape}/msc/gs/npchandler/Tanner.java | 20 +- .../msc/gs/npchandler/Thrander.java | 14 +- .../msc/gs/phandler/PacketHandler.java | 4 +- .../msc/gs/phandler}/PacketHandlerDef.java | 2 +- .../msc/gs/phandler/PlayerLogin.java | 34 +- .../msc/gs/phandler/client/AttackHandler.java | 38 +- .../msc/gs/phandler/client/BankHandler.java | 24 +- .../msc/gs/phandler/client/BotHandler.java | 14 +- .../msc/gs/phandler/client/ChatHandler.java | 12 +- .../gs/phandler/client/CommandHandler.java | 50 +- .../msc/gs/phandler/client/DropHandler.java | 24 +- .../msc/gs/phandler/client/DuelHandler.java | 38 +- .../msc/gs/phandler/client/DummyPacket.java | 10 +- .../gs/phandler/client/ExceptionHandler.java | 14 +- .../msc/gs/phandler/client/FollowRequest.java | 14 +- .../msc/gs/phandler/client/FriendHandler.java | 24 +- .../phandler/client/GameSettingHandler.java | 16 +- .../gs/phandler/client/InvActionHandler.java | 40 +- .../phandler/client/InvUseOnGroundItem.java | 42 +- .../msc/gs/phandler/client/InvUseOnItem.java | 44 +- .../msc/gs/phandler/client/InvUseOnNpc.java | 28 +- .../gs/phandler/client/InvUseOnObject.java | 66 +- .../gs/phandler/client/InvUseOnPlayer.java | 26 +- .../gs/phandler/client/MenuReplyHandler.java | 14 +- .../msc/gs/phandler/client/NpcCommand.java | 20 +- .../msc/gs/phandler/client/ObjectAction.java | 74 +-- .../msc/gs/phandler/client/PickupItem.java | 46 +- .../msc/gs/phandler/client/Ping.java | 10 +- .../client/PlayerAppearanceIDHandler.java | 12 +- .../client/PlayerAppearanceUpdater.java | 18 +- .../msc/gs/phandler/client/PlayerLogin.java | 20 +- .../msc/gs/phandler/client/PlayerLogout.java | 10 +- .../phandler/client/PlayerLogoutRequest.java | 12 +- .../msc/gs/phandler/client/PrayerHandler.java | 18 +- .../client/PrivacySettingHandler.java | 16 +- .../msc/gs/phandler/client/ReportHandler.java | 18 +- .../gs/phandler/client/SessionRequest.java | 18 +- .../msc/gs/phandler/client/ShopHandler.java | 26 +- .../msc/gs/phandler/client/Sleepword.java | 18 +- .../msc/gs/phandler/client/SpellHandler.java | 60 +- .../msc/gs/phandler/client/StyleHandler.java | 12 +- .../gs/phandler/client/TalkToNpcHandler.java | 32 +- .../msc/gs/phandler/client/TradeHandler.java | 34 +- .../msc/gs/phandler/client/Trap.java | 14 +- .../msc/gs/phandler/client/TrapHandler.java | 14 +- .../msc/gs/phandler/client/WalkRequest.java | 30 +- .../gs/phandler/client/WallObjectAction.java | 40 +- .../msc/gs/phandler/client/WieldHandler.java | 26 +- .../msc/gs/phandler/ls/AlertHandler.java | 16 +- .../msc/gs/phandler/ls/ForceLogout.java | 16 +- .../msc/gs/phandler/ls/FriendLogin.java | 14 +- .../msc/gs/phandler/ls/FriendLogout.java | 14 +- .../msc/gs/phandler/ls/GlobalHandler.java | 16 +- .../phandler/ls/PlayerInfoRequestHandler.java | 16 +- .../phandler/ls/PlayerListRequestHandler.java | 16 +- .../msc/gs/phandler/ls/ReceivePM.java | 14 +- .../phandler/ls/ReportInfoRequestHandler.java | 18 +- .../msc/gs/phandler/ls/ShutdownHandler.java | 14 +- .../gs/phandler/ls/StatRequestHandler.java | 16 +- .../msc/gs/phandler/ls/UpdateHandler.java | 16 +- .../msc/gs/plugins/ai/KingBlackDragon.java | 27 +- .../msc/gs/plugins/ai/RedDragon.java | 27 +- .../msc/gs/plugins/dependencies/NpcAI.java | 6 +- .../gs/plugins/dependencies/NpcScript.java | 13 +- .../plugins/dependencies/PluginHandler.java | 17 +- .../msc/gs/plugins/extras/Quiz.java | 11 +- .../msc/gs/plugins/extras/Thieving.java | 37 +- .../gs/plugins/listeners/ItemListener.java | 5 + .../plugins/listeners/ItemOnItemListener.java | 5 + .../listeners/ItemOnObjectListener.java | 5 + .../msc/gs/plugins/listeners/NpcListener.java | 5 + .../gs/plugins/listeners/ObjectListener.java | 6 +- .../msc/gs/plugins/plugs/Test.java | 8 +- .../msc/gs/plugins/plugs/skills/Mining.java | 28 +- .../msc/gs/plugins/quests/CooksAssistant.java | 10 +- .../msc/gs/plugins/quests/Dorics.java | 8 +- .../gs/plugins/quests/GoblinDiplomacy.java | 8 +- .../msc/gs/plugins/quests/ImpCatcher.java | 14 +- .../msc/gs/plugins/quests/KnightsSword.java | 26 +- .../msc/gs/plugins/quests/SheepShearer.java | 12 +- .../msc/gs/plugins/quests/WitchsPotion.java | 14 +- .../moparscape}/msc/gs/quest/Quest.java | 27 +- .../moparscape}/msc/gs/quest/QuestAction.java | 2 +- .../moparscape}/msc/gs/quest/QuestEvent.java | 6 +- .../msc/gs/quest/QuestEventManager.java | 9 +- .../msc/gs/quest/QuestManager.java | 23 +- .../moparscape}/msc/gs/states/Action.java | 2 +- .../msc/gs/states/CombatState.java | 2 +- .../moparscape}/msc/gs/tools/Captcha.java | 7 +- .../msc/gs/tools/DataConversions.java | 9 +- .../msc/gs/tools/PaintCaptcha.java | 2 +- .../msc/gs/util/DefCompressor.java | 2 +- .../moparscape}/msc/gs/util/DelayMonitor.java | 2 +- .../moparscape}/msc/gs/util/DuelLog.java | 8 +- .../moparscape}/msc/gs/util/EntityList.java | 5 +- .../msc/gs/util/EntityListIterator.java | 5 +- .../moparscape}/msc/gs/util/Logger.java | 7 +- .../moparscape}/msc/gs/util/MapGenerator.java | 13 +- .../moparscape}/msc/gs/util/ObjectLoader.java | 5 +- .../msc/gs/util/PersistenceManager.java | 5 +- .../org/moparscape/msc/gs/util/Processor.java | 7 + .../{ => org/moparscape}/msc/gs/util/RSA.java | 2 +- .../msc/gs/util/StatefulEntityCollection.java | 5 +- .../moparscape}/msc/gs/util/WorkGroup.java | 7 +- .../moparscape}/msc/gs/util/Worker.java | 5 +- .../moparscape}/msc/irc/CommandHandler.java | 17 +- .../src/{ => org/moparscape}/msc/irc/IRC.java | 6 +- GameServer/world.xml | 7 +- LoginServer/build.xml | 42 +- LoginServer/conf/ls/FPacketHandlers.xml | 12 +- LoginServer/conf/ls/LSPacketHandlers.xml | 28 +- LoginServer/conf/ls/aliases.xml | 2 +- LoginServer/ls.conf | 4 +- LoginServer/ls.jar | Bin 82301 -> 82303 bytes LoginServer/src/.svn/entries | 2 +- .../moparscape/msc}/ls/LoginEngine.java | 17 +- .../moparscape/msc}/ls/Server.java | 14 +- .../msc}/ls/codec/FCodecFactory.java | 2 +- .../msc}/ls/codec/FProtocolDecoder.java | 6 +- .../msc}/ls/codec/FProtocolEncoder.java | 6 +- .../msc/ls/codec}/LSCodecFactory.java | 2 +- .../msc}/ls/codec/LSProtocolDecoder.java | 4 +- .../msc}/ls/codec/LSProtocolEncoder.java | 6 +- .../moparscape/msc}/ls/model/BankItem.java | 2 +- .../moparscape/msc}/ls/model/InvItem.java | 2 +- .../moparscape/msc}/ls/model/Item.java | 2 +- .../moparscape/msc}/ls/model/PlayerSave.java | 7 +- .../moparscape/msc}/ls/model/World.java | 8 +- .../msc}/ls/net/DatabaseConnection.java | 7 +- .../msc}/ls/net/FConnectionHandler.java | 6 +- .../moparscape/msc}/ls/net/FPacket.java | 2 +- .../msc}/ls/net/LSConnectionHandler.java | 10 +- .../moparscape/msc}/ls/net/LSPacket.java | 2 +- .../moparscape/msc}/ls/net/Packet.java | 4 +- .../moparscape/msc}/ls/net/PacketQueue.java | 2 +- .../msc}/ls/packetbuilder/FPacketBuilder.java | 4 +- .../ls/packetbuilder/LSPacketBuilder.java | 9 +- .../ls/packetbuilder/StaticPacketBuilder.java | 6 +- .../loginserver/MiscPacketBuilder.java | 13 +- .../loginserver/PlayerLoginPacketBuilder.java | 17 +- .../loginserver/ReplyPacketBuilder.java | 6 +- .../WorldRegisteredPacketBuilder.java | 6 +- .../msc}/ls/packethandler/PacketHandler.java | 4 +- .../ls/packethandler}/PacketHandlerDef.java | 2 +- .../msc}/ls/packethandler/frontend/Alert.java | 14 +- .../packethandler/frontend/AuctionHouse.java | 14 +- .../ls/packethandler/frontend/Global.java | 14 +- .../packethandler/frontend/ListPlayers.java | 14 +- .../ls/packethandler/frontend/Logout.java | 14 +- .../ls/packethandler/frontend/Shutdown.java | 14 +- .../ls/packethandler/frontend/Update.java | 14 +- .../packethandler/loginserver/BanHandler.java | 16 +- .../loginserver/BanHandler.java.2 | 0 .../loginserver/BanHandler.java.autothread | 0 .../loginserver/FriendHandler.java | 14 +- .../loginserver/GameSettingHandler.java | 10 +- .../loginserver/KillHandler.java | 8 +- .../packethandler/loginserver/LogHandler.java | 10 +- .../loginserver/PlayerInfoRequestHandler.java | 14 +- .../loginserver/PlayerLoginHandler.java | 16 +- .../loginserver/PlayerLoginHandler.java.1 | 0 .../loginserver/PlayerLogoutHandler.java | 8 +- .../loginserver/PlayerSaveHandler.java | 14 +- .../loginserver/PrivacySettingHandler.java | 10 +- .../loginserver/RegisterWorld.java | 16 +- .../loginserver/ReportHandler.java | 10 +- .../SaveProfilesRequestHandler.java | 14 +- .../packethandler/loginserver/Tradelog.java | 8 +- .../moparscape/msc}/ls/util/Config.java | 2 +- .../msc}/ls/util/DataConversions.java | 2 +- .../msc}/ls/util/PersistenceManager.java | 5 +- LoginServer/src/rsca/.svn/entries | 40 -- LoginServer/src/rsca/.svn/format | 1 - LoginServer/src/rsca/ls/.svn/entries | 114 ---- LoginServer/src/rsca/ls/.svn/format | 1 - .../.svn/text-base/LoginEngine.java.svn-base | 151 ----- .../ls/.svn/text-base/Server.java.svn-base | 197 ------ LoginServer/src/rsca/ls/codec/.svn/entries | 232 ------- LoginServer/src/rsca/ls/codec/.svn/format | 1 - .../text-base/FCodecFactory.java.svn-base | 38 -- .../text-base/FProtocolDecoder.java.svn-base | 79 --- .../text-base/FProtocolEncoder.java.svn-base | 62 -- .../text-base/LSCodecFactory.java.svn-base | 37 -- .../text-base/LSProtocolDecoder.java.svn-base | 59 -- .../text-base/LSProtocolEncoder.java.svn-base | 60 -- LoginServer/src/rsca/ls/model/.svn/entries | 198 ------ LoginServer/src/rsca/ls/model/.svn/format | 1 - .../.svn/text-base/BankItem.java.svn-base | 7 - .../.svn/text-base/InvItem.java.svn-base | 14 - .../model/.svn/text-base/Item.java.svn-base | 19 - .../.svn/text-base/PlayerSave.java.svn-base | 528 --------------- .../model/.svn/text-base/World.java.svn-base | 122 ---- LoginServer/src/rsca/ls/net/.svn/entries | 266 -------- LoginServer/src/rsca/ls/net/.svn/format | 1 - .../DatabaseConnection.java.svn-base | 122 ---- .../FConnectionHandler.java.svn-base | 109 ---- .../net/.svn/text-base/FPacket.java.svn-base | 62 -- .../LSConnectionHandler.java.svn-base | 116 ---- .../net/.svn/text-base/LSPacket.java.svn-base | 55 -- .../net/.svn/text-base/Packet.java.svn-base | 257 -------- .../.svn/text-base/PacketQueue.java.svn-base | 43 -- .../src/rsca/ls/packetbuilder/.svn/entries | 136 ---- .../src/rsca/ls/packetbuilder/.svn/format | 1 - .../text-base/FPacketBuilder.java.svn-base | 47 -- .../text-base/LSPacketBuilder.java.svn-base | 69 -- .../StaticPacketBuilder.java.svn-base | 254 -------- .../ls/packetbuilder/frontend/.svn/entries | 28 - .../ls/packetbuilder/frontend/.svn/format | 1 - .../ls/packetbuilder/loginserver/.svn/entries | 164 ----- .../ls/packetbuilder/loginserver/.svn/format | 1 - .../text-base/MiscPacketBuilder.java.svn-base | 135 ---- .../PlayerLoginPacketBuilder.java.svn-base | 150 ----- .../ReplyPacketBuilder.java.svn-base | 50 -- ...WorldRegisteredPacketBuilder.java.svn-base | 36 -- .../src/rsca/ls/packethandler/.svn/entries | 102 --- .../src/rsca/ls/packethandler/.svn/format | 1 - .../text-base/PacketHandler.java.svn-base | 9 - .../text-base/PacketHandlerDef.java.svn-base | 48 -- .../ls/packethandler/frontend/.svn/entries | 232 ------- .../ls/packethandler/frontend/.svn/format | 1 - .../.svn/text-base/Alert.java.svn-base | 34 - .../.svn/text-base/Global.java.svn-base | 32 - .../.svn/text-base/ListPlayers.java.svn-base | 46 -- .../.svn/text-base/Logout.java.svn-base | 34 - .../.svn/text-base/Shutdown.java.svn-base | 40 -- .../.svn/text-base/Update.java.svn-base | 32 - .../ls/packethandler/loginserver/.svn/entries | 606 ------------------ .../ls/packethandler/loginserver/.svn/format | 1 - .../.svn/text-base/BanHandler.java.2.svn-base | 55 -- .../BanHandler.java.autothread.svn-base | 68 -- .../.svn/text-base/BanHandler.java.svn-base | 53 -- .../text-base/FriendHandler.java.svn-base | 87 --- .../GameSettingHandler.java.svn-base | 66 -- .../.svn/text-base/KillHandler.java.svn-base | 21 - .../.svn/text-base/LogHandler.java.svn-base | 59 -- .../PlayerInfoRequestHandler.java.svn-base | 42 -- .../PlayerLoginHandler.java.1.svn-base | 89 --- .../PlayerLoginHandler.java.svn-base | 108 ---- .../PlayerLogoutHandler.java.svn-base | 16 - .../text-base/PlayerSaveHandler.java.svn-base | 64 -- .../PrivacySettingHandler.java.svn-base | 67 -- .../text-base/RegisterWorld.java.svn-base | 72 --- .../text-base/ReportHandler.java.svn-base | 34 - .../SaveProfilesRequestHandler.java.svn-base | 42 -- .../.svn/text-base/Tradelog.java.svn-base | 21 - LoginServer/src/rsca/ls/util/.svn/entries | 130 ---- LoginServer/src/rsca/ls/util/.svn/format | 1 - .../util/.svn/text-base/Config.java.svn-base | 63 -- .../text-base/DataConversions.java.svn-base | 81 --- .../PersistenceManager.java.svn-base | 65 -- 424 files changed, 2290 insertions(+), 8953 deletions(-) delete mode 100644 GameServer/conf/server/Conf.xml delete mode 100644 GameServer/src/msc/config/Constants.java delete mode 100644 GameServer/src/msc/gs/npchandler/NpcHandler.java delete mode 100644 GameServer/src/msc/gs/plugins/listeners/ItemListener.java delete mode 100644 GameServer/src/msc/gs/plugins/listeners/ItemOnItemListener.java delete mode 100644 GameServer/src/msc/gs/plugins/listeners/ItemOnObjectListener.java delete mode 100644 GameServer/src/msc/gs/plugins/listeners/NpcListener.java delete mode 100644 GameServer/src/msc/gs/util/Processor.java rename GameServer/src/{ => org/moparscape}/msc/config/Config.java (98%) create mode 100644 GameServer/src/org/moparscape/msc/config/Constants.java rename GameServer/src/{ => org/moparscape}/msc/config/Formulae.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/CacheHandler.java (84%) rename GameServer/src/{ => org/moparscape}/msc/gs/Instance.java (67%) rename GameServer/src/{ => org/moparscape}/msc/gs/Server.java (91%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/GameObjectPositionPacketBuilder.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ItemPositionPacketBuilder.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/LSPacketBuilder.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/MiscPacketBuilder.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/NpcPositionPacketBuilder.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/NpcUpdatePacketBuilder.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/PlayerPositionPacketBuilder.java (84%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/PlayerUpdatePacketBuilder.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/RSCPacketBuilder.java (84%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/StaticPacketBuilder.java (98%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/WallObjectPositionPacketBuilder.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java (74%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ls/MiscPacketBuilder.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java (75%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java (63%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java (74%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java (69%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ls/SavePacketBuilder.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/builders/ls/StatRequestPacketBuilder.java (62%) rename {LoginServer/src/rsca/ls/codec => GameServer/src/org/moparscape/msc/gs/connection}/LSCodecFactory.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/LSConnectionHandler.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/LSPacket.java (96%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/LSProtocolDecoder.java (97%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/LSProtocolEncoder.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/Packet.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/PacketQueue.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/RSCCodecFactory.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/RSCConnectionHandler.java (96%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/RSCPacket.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/RSCProtocolDecoder.java (96%) rename GameServer/src/{ => org/moparscape}/msc/gs/connection/RSCProtocolEncoder.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/core/ClientUpdater.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/core/DelayedEventHandler.java (83%) rename GameServer/src/{ => org/moparscape}/msc/gs/core/GameEngine.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/core/LoginConnector.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/db/DBConnection.java (92%) rename GameServer/src/{ => org/moparscape}/msc/gs/db/ReportHandlerQueries.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/DelayedEvent.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/DelayedQuestChat.java (74%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/DuelEvent.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/FightEvent.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/MiniEvent.java (76%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/ObjectRemover.java (75%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/RangeEvent.java (91%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/ShortEvent.java (63%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/SingleEvent.java (77%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/WalkMobToMobEvent.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/WalkToMobEvent.java (82%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/WalkToObjectEvent.java (81%) rename GameServer/src/{ => org/moparscape}/msc/gs/event/WalkToPointEvent.java (83%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/AgilityCourseDef.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/AgilityDef.java (92%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/CertDef.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/CerterDef.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/DoorDef.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/EntityDef.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/EntityHandler.java (98%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/FiremakingDef.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/GameObjectDef.java (96%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/GameObjectLoc.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemArrowHeadDef.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemBowStringDef.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemCookingDef.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemCraftingDef.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemDartTipDef.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemDef.java (96%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemDropDef.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemGemDef.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemHerbDef.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemHerbSecond.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemLoc.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemLogCutDef.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemSmeltingDef.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemSmithingDef.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemUnIdentHerbDef.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ItemWieldableDef.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/NPCDef.java (98%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/NPCLoc.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ObjectFishDef.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ObjectFishingDef.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ObjectMiningDef.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ObjectWoodcuttingDef.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/PrayerDef.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/ReqOreDef.java (82%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/SpellDef.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/external/TileDef.java (82%) rename GameServer/src/{ => org/moparscape}/msc/gs/io/WorldLoader.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/ActiveTile.java (91%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Bank.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Bubble.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/ChatMessage.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Entity.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/GameObject.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/InvItem.java (81%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Inventory.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Item.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/MenuHandler.java (91%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Mob.java (91%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Npc.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Path.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/PathGenerator.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/PathHandler.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Player.java (98%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/PlayerAppearance.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Point.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Projectile.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Script.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Sector.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Shop.java (92%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Syndicate.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/TelePoint.java (73%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/Tile.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/TileValue.java (84%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/ViewArea.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/World.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/mini/Cache.java (77%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/mini/Damager.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/snapshot/Activity.java (82%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/snapshot/Chatlog.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/model/snapshot/Snapshot.java (82%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/Aggie.java (84%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/Apothecary.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/Bananas.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/Bankers.java (70%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/Boat.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/Certer.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/EntranaMonks.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/KebabSeller.java (79%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/MakeOverMage.java (81%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/MonkHealer.java (80%) create mode 100644 GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandler.java rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/NpcHandlerDef.java (92%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/OtherNPC.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/ShopKeeper.java (58%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/ShopKeeper.java.1 (100%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/Tanner.java (84%) rename GameServer/src/{ => org/moparscape}/msc/gs/npchandler/Thrander.java (72%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/PacketHandler.java (61%) rename {LoginServer/src/rsca/ls/packethandler => GameServer/src/org/moparscape/msc/gs/phandler}/PacketHandlerDef.java (92%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/PlayerLogin.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/AttackHandler.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/BankHandler.java (87%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/BotHandler.java (81%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/ChatHandler.java (64%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/CommandHandler.java (88%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/DropHandler.java (75%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/DuelHandler.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/DummyPacket.java (69%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/ExceptionHandler.java (65%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/FollowRequest.java (75%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/FriendHandler.java (81%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/GameSettingHandler.java (67%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/InvActionHandler.java (96%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/InvUseOnGroundItem.java (83%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/InvUseOnItem.java (97%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/InvUseOnNpc.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/InvUseOnObject.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/InvUseOnPlayer.java (83%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/MenuReplyHandler.java (68%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/NpcCommand.java (69%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/ObjectAction.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/PickupItem.java (79%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/Ping.java (66%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/PlayerAppearanceIDHandler.java (69%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/PlayerAppearanceUpdater.java (82%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/PlayerLogin.java (79%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/PlayerLogout.java (55%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/PlayerLogoutRequest.java (60%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/PrayerHandler.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/PrivacySettingHandler.java (73%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/ReportHandler.java (74%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/SessionRequest.java (64%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/ShopHandler.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/Sleepword.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/SpellHandler.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/StyleHandler.java (63%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/TalkToNpcHandler.java (83%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/TradeHandler.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/Trap.java (57%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/TrapHandler.java (56%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/WalkRequest.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/WallObjectAction.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/client/WieldHandler.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/AlertHandler.java (58%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/ForceLogout.java (57%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/FriendLogin.java (61%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/FriendLogout.java (67%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/GlobalHandler.java (57%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/PlayerInfoRequestHandler.java (61%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/PlayerListRequestHandler.java (58%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/ReceivePM.java (68%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/ReportInfoRequestHandler.java (60%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/ShutdownHandler.java (54%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/StatRequestHandler.java (58%) rename GameServer/src/{ => org/moparscape}/msc/gs/phandler/ls/UpdateHandler.java (63%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/ai/KingBlackDragon.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/ai/RedDragon.java (80%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/dependencies/NpcAI.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/dependencies/NpcScript.java (76%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/dependencies/PluginHandler.java (85%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/extras/Quiz.java (98%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/extras/Thieving.java (96%) create mode 100644 GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemListener.java create mode 100644 GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnItemListener.java create mode 100644 GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnObjectListener.java create mode 100644 GameServer/src/org/moparscape/msc/gs/plugins/listeners/NpcListener.java rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/listeners/ObjectListener.java (83%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/plugs/Test.java (70%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/plugs/skills/Mining.java (83%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/quests/CooksAssistant.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/quests/Dorics.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/quests/GoblinDiplomacy.java (96%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/quests/ImpCatcher.java (97%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/quests/KnightsSword.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/quests/SheepShearer.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/plugins/quests/WitchsPotion.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/quest/Quest.java (91%) rename GameServer/src/{ => org/moparscape}/msc/gs/quest/QuestAction.java (92%) rename GameServer/src/{ => org/moparscape}/msc/gs/quest/QuestEvent.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/quest/QuestEventManager.java (89%) rename GameServer/src/{ => org/moparscape}/msc/gs/quest/QuestManager.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/states/Action.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/states/CombatState.java (79%) rename GameServer/src/{ => org/moparscape}/msc/gs/tools/Captcha.java (97%) rename GameServer/src/{ => org/moparscape}/msc/gs/tools/DataConversions.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/tools/PaintCaptcha.java (99%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/DefCompressor.java (97%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/DelayMonitor.java (95%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/DuelLog.java (68%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/EntityList.java (91%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/EntityListIterator.java (86%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/Logger.java (94%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/MapGenerator.java (90%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/ObjectLoader.java (83%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/PersistenceManager.java (91%) create mode 100644 GameServer/src/org/moparscape/msc/gs/util/Processor.java rename GameServer/src/{ => org/moparscape}/msc/gs/util/RSA.java (97%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/StatefulEntityCollection.java (92%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/WorkGroup.java (93%) rename GameServer/src/{ => org/moparscape}/msc/gs/util/Worker.java (92%) rename GameServer/src/{ => org/moparscape}/msc/irc/CommandHandler.java (85%) rename GameServer/src/{ => org/moparscape}/msc/irc/IRC.java (94%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/LoginEngine.java (88%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/Server.java (89%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/codec/FCodecFactory.java (96%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/codec/FProtocolDecoder.java (94%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/codec/FProtocolEncoder.java (93%) rename {GameServer/src/msc/gs/connection => LoginServer/src/org/moparscape/msc/ls/codec}/LSCodecFactory.java (96%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/codec/LSProtocolDecoder.java (95%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/codec/LSProtocolEncoder.java (93%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/model/BankItem.java (71%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/model/InvItem.java (82%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/model/Item.java (81%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/model/PlayerSave.java (99%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/model/World.java (91%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/net/DatabaseConnection.java (96%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/net/FConnectionHandler.java (92%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/net/FPacket.java (97%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/net/LSConnectionHandler.java (90%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/net/LSPacket.java (96%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/net/Packet.java (94%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/net/PacketQueue.java (91%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packetbuilder/FPacketBuilder.java (87%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packetbuilder/LSPacketBuilder.java (83%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packetbuilder/StaticPacketBuilder.java (98%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packetbuilder/loginserver/MiscPacketBuilder.java (88%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java (88%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packetbuilder/loginserver/ReplyPacketBuilder.java (79%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java (75%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/PacketHandler.java (62%) rename {GameServer/src/msc/gs/phandler => LoginServer/src/org/moparscape/msc/ls/packethandler}/PacketHandlerDef.java (92%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/frontend/Alert.java (66%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/frontend/AuctionHouse.java (77%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/frontend/Global.java (62%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/frontend/ListPlayers.java (76%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/frontend/Logout.java (66%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/frontend/Shutdown.java (68%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/frontend/Update.java (62%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/BanHandler.java (78%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/BanHandler.java.2 (100%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/BanHandler.java.autothread (100%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/FriendHandler.java (86%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/GameSettingHandler.java (85%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/KillHandler.java (69%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/LogHandler.java (82%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/PlayerInfoRequestHandler.java (72%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/PlayerLoginHandler.java (86%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/PlayerLoginHandler.java.1 (100%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/PlayerLogoutHandler.java (58%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/PlayerSaveHandler.java (82%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/PrivacySettingHandler.java (86%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/RegisterWorld.java (77%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/ReportHandler.java (77%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/SaveProfilesRequestHandler.java (68%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/packethandler/loginserver/Tradelog.java (74%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/util/Config.java (97%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/util/DataConversions.java (93%) rename LoginServer/src/{rsca => org/moparscape/msc}/ls/util/PersistenceManager.java (92%) delete mode 100644 LoginServer/src/rsca/.svn/entries delete mode 100644 LoginServer/src/rsca/.svn/format delete mode 100644 LoginServer/src/rsca/ls/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/.svn/format delete mode 100644 LoginServer/src/rsca/ls/.svn/text-base/LoginEngine.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/.svn/text-base/Server.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/codec/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/codec/.svn/format delete mode 100644 LoginServer/src/rsca/ls/codec/.svn/text-base/FCodecFactory.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/codec/.svn/text-base/FProtocolDecoder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/codec/.svn/text-base/FProtocolEncoder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/codec/.svn/text-base/LSCodecFactory.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/codec/.svn/text-base/LSProtocolDecoder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/codec/.svn/text-base/LSProtocolEncoder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/model/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/model/.svn/format delete mode 100644 LoginServer/src/rsca/ls/model/.svn/text-base/BankItem.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/model/.svn/text-base/InvItem.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/model/.svn/text-base/Item.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/model/.svn/text-base/PlayerSave.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/model/.svn/text-base/World.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/net/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/net/.svn/format delete mode 100644 LoginServer/src/rsca/ls/net/.svn/text-base/DatabaseConnection.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/net/.svn/text-base/FConnectionHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/net/.svn/text-base/FPacket.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/net/.svn/text-base/LSConnectionHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/net/.svn/text-base/LSPacket.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/net/.svn/text-base/Packet.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/net/.svn/text-base/PacketQueue.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/.svn/format delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/FPacketBuilder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/LSPacketBuilder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/StaticPacketBuilder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/frontend/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/frontend/.svn/format delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/format delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/MiscPacketBuilder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/PlayerLoginPacketBuilder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/ReplyPacketBuilder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/WorldRegisteredPacketBuilder.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/packethandler/.svn/format delete mode 100644 LoginServer/src/rsca/ls/packethandler/.svn/text-base/PacketHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/.svn/text-base/PacketHandlerDef.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/frontend/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/packethandler/frontend/.svn/format delete mode 100644 LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Alert.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Global.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/ListPlayers.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Logout.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Shutdown.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Update.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/format delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.2.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.autothread.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/FriendHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/GameSettingHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/KillHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/LogHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerInfoRequestHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLoginHandler.java.1.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLoginHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLogoutHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerSaveHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PrivacySettingHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/RegisterWorld.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/ReportHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/SaveProfilesRequestHandler.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/Tradelog.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/util/.svn/entries delete mode 100644 LoginServer/src/rsca/ls/util/.svn/format delete mode 100644 LoginServer/src/rsca/ls/util/.svn/text-base/Config.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/util/.svn/text-base/DataConversions.java.svn-base delete mode 100644 LoginServer/src/rsca/ls/util/.svn/text-base/PersistenceManager.java.svn-base diff --git a/GameServer/build.xml b/GameServer/build.xml index 74d56b2..c4cf942 100644 --- a/GameServer/build.xml +++ b/GameServer/build.xml @@ -1,5 +1,5 @@ - - + + @@ -7,181 +7,51 @@ - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + - - - + + + + + + + + + + + - + + - + diff --git a/GameServer/conf/ls/FPacketHandlers.xml b/GameServer/conf/ls/FPacketHandlers.xml index fbede84..c25d954 100644 --- a/GameServer/conf/ls/FPacketHandlers.xml +++ b/GameServer/conf/ls/FPacketHandlers.xml @@ -3,36 +3,36 @@ 1 - msc.ls.packethandler.frontend.Logout + org.moparscape.msc.ls.packethandler.frontend.Logout 2 - msc.ls.packethandler.frontend.Shutdown + org.moparscape.msc.ls.packethandler.frontend.Shutdown 3 - msc.ls.packethandler.frontend.Update + org.moparscape.msc.ls.packethandler.frontend.Update 5 - msc.ls.packethandler.frontend.Global + org.moparscape.msc.ls.packethandler.frontend.Global 6 - msc.ls.packethandler.frontend.Alert + org.moparscape.msc.ls.packethandler.frontend.Alert 7 - msc.ls.packethandler.frontend.ListPlayers + org.moparscape.msc.ls.packethandler.frontend.ListPlayers \ No newline at end of file diff --git a/GameServer/conf/ls/LSPacketHandlers.xml b/GameServer/conf/ls/LSPacketHandlers.xml index 5cf1d12..9c9e6be 100644 --- a/GameServer/conf/ls/LSPacketHandlers.xml +++ b/GameServer/conf/ls/LSPacketHandlers.xml @@ -4,44 +4,44 @@ 1 2 - msc.ls.packethandler.loginserver.RegisterWorld + org.moparscape.msc.ls.packethandler.loginserver.RegisterWorld 3 - msc.ls.packethandler.loginserver.KillHandler + org.moparscape.msc.ls.packethandler.loginserver.KillHandler 4 5 - msc.ls.packethandler.loginserver.BanHandler + org.moparscape.msc.ls.packethandler.loginserver.BanHandler 6 - msc.ls.packethandler.loginserver.PrivacySettingHandler + org.moparscape.msc.ls.packethandler.loginserver.PrivacySettingHandler 7 - msc.ls.packethandler.loginserver.GameSettingHandler + org.moparscape.msc.ls.packethandler.loginserver.GameSettingHandler 8 - msc.ls.packethandler.loginserver.PlayerInfoRequestHandler + org.moparscape.msc.ls.packethandler.loginserver.PlayerInfoRequestHandler 9 - msc.ls.packethandler.loginserver.SaveProfilesRequestHandler + org.moparscape.msc.ls.packethandler.loginserver.SaveProfilesRequestHandler @@ -51,42 +51,42 @@ 13 14 - msc.ls.packethandler.loginserver.FriendHandler + org.moparscape.msc.ls.packethandler.loginserver.FriendHandler 15 - msc.ls.packethandler.loginserver.ReportHandler + org.moparscape.msc.ls.packethandler.loginserver.ReportHandler 20 - msc.ls.packethandler.loginserver.PlayerSaveHandler + org.moparscape.msc.ls.packethandler.loginserver.PlayerSaveHandler 30 - msc.ls.packethandler.loginserver.PlayerLogoutHandler + org.moparscape.msc.ls.packethandler.loginserver.PlayerLogoutHandler 31 - msc.ls.packethandler.loginserver.PlayerLoginHandler + org.moparscape.msc.ls.packethandler.loginserver.PlayerLoginHandler 32 - msc.ls.packethandler.loginserver.LogHandler + org.moparscape.msc.ls.packethandler.loginserver.LogHandler 33 - msc.ls.packethandler.loginserver.Tradelog + org.moparscape.msc.ls.packethandler.loginserver.Tradelog diff --git a/GameServer/conf/ls/aliases.xml b/GameServer/conf/ls/aliases.xml index 4ec4393..4738810 100644 --- a/GameServer/conf/ls/aliases.xml +++ b/GameServer/conf/ls/aliases.xml @@ -3,5 +3,5 @@ Stores aliases for the XStream engine - msc.ls.packethandler.PacketHandlerDef + org.moparscape.msc.ls.packethandler.PacketHandlerDef diff --git a/GameServer/conf/server/Conf.xml b/GameServer/conf/server/Conf.xml deleted file mode 100644 index 1b756f9..0000000 --- a/GameServer/conf/server/Conf.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - RSCD Config - 27 - 208.110.86.234 - 43595 - msc - London - 800 - 1 - localhost - 34522 - diff --git a/GameServer/conf/server/LSPacketHandlers.xml b/GameServer/conf/server/LSPacketHandlers.xml index 2722701..c82d68f 100644 --- a/GameServer/conf/server/LSPacketHandlers.xml +++ b/GameServer/conf/server/LSPacketHandlers.xml @@ -3,73 +3,73 @@ 1 - msc.gs.phandler.ls.StatRequestHandler + org.moparscape.msc.gs.phandler.ls.StatRequestHandler 2 - msc.gs.phandler.ls.PlayerListRequestHandler + org.moparscape.msc.gs.phandler.ls.PlayerListRequestHandler 3 - msc.gs.phandler.ls.ShutdownHandler + org.moparscape.msc.gs.phandler.ls.ShutdownHandler 4 - msc.gs.phandler.ls.UpdateHandler + org.moparscape.msc.gs.phandler.ls.UpdateHandler 5 - msc.gs.phandler.ls.GlobalHandler + org.moparscape.msc.gs.phandler.ls.GlobalHandler 6 - msc.gs.phandler.ls.AlertHandler + org.moparscape.msc.gs.phandler.ls.AlertHandler 7 - msc.gs.phandler.ls.ForceLogout + org.moparscape.msc.gs.phandler.ls.ForceLogout 8 - msc.gs.phandler.ls.ReportInfoRequestHandler + org.moparscape.msc.gs.phandler.ls.ReportInfoRequestHandler 9 - msc.gs.phandler.ls.PlayerInfoRequestHandler + org.moparscape.msc.gs.phandler.ls.PlayerInfoRequestHandler 10 - msc.gs.phandler.ls.ReceivePM + org.moparscape.msc.gs.phandler.ls.ReceivePM 11 - msc.gs.phandler.ls.FriendLogin + org.moparscape.msc.gs.phandler.ls.FriendLogin 12 13 - msc.gs.phandler.ls.FriendLogout + org.moparscape.msc.gs.phandler.ls.FriendLogout \ No newline at end of file diff --git a/GameServer/conf/server/NpcHandlers.xml b/GameServer/conf/server/NpcHandlers.xml index 00f0a47..37abbe9 100644 --- a/GameServer/conf/server/NpcHandlers.xml +++ b/GameServer/conf/server/NpcHandlers.xml @@ -9,50 +9,50 @@ 617 792 - msc.gs.npchandler.Bankers + org.moparscape.msc.gs.npchandler.Bankers 125 - msc.gs.npchandler.Aggie + org.moparscape.msc.gs.npchandler.Aggie 164 - msc.gs.npchandler.Bananas + org.moparscape.msc.gs.npchandler.Bananas 33 - msc.gs.npchandler.Apothecary + org.moparscape.msc.gs.npchandler.Apothecary 172 - msc.gs.npchandler.Tanner + org.moparscape.msc.gs.npchandler.Tanner 90 - msc.gs.npchandler.KebabSeller + org.moparscape.msc.gs.npchandler.KebabSeller 339 - msc.gs.npchandler.MakeOverMage + org.moparscape.msc.gs.npchandler.MakeOverMage 160 - msc.gs.npchandler.Thrander + org.moparscape.msc.gs.npchandler.Thrander @@ -133,7 +133,7 @@ 779 269 - msc.gs.npchandler.ShopKeeper + org.moparscape.msc.gs.npchandler.ShopKeeper @@ -155,19 +155,19 @@ 347 - msc.gs.npchandler.Certer + org.moparscape.msc.gs.npchandler.Certer 93 - msc.gs.npchandler.MonkHealer + org.moparscape.msc.gs.npchandler.MonkHealer 212 - msc.gs.npchandler.EntranaMonks + org.moparscape.msc.gs.npchandler.EntranaMonks diff --git a/GameServer/conf/server/PacketHandlers.xml b/GameServer/conf/server/PacketHandlers.xml index bafada0..29caef5 100644 --- a/GameServer/conf/server/PacketHandlers.xml +++ b/GameServer/conf/server/PacketHandlers.xml @@ -3,106 +3,106 @@ 0 - msc.gs.phandler.client.DummyPacket + org.moparscape.msc.gs.phandler.client.DummyPacket 77 - msc.gs.phandler.client.PlayerLogin + org.moparscape.msc.gs.phandler.client.PlayerLogin 69 - msc.gs.phandler.client.BotHandler + org.moparscape.msc.gs.phandler.client.BotHandler 32 - msc.gs.phandler.client.SessionRequest + org.moparscape.msc.gs.phandler.client.SessionRequest 129 - msc.gs.phandler.client.PlayerLogoutRequest + org.moparscape.msc.gs.phandler.client.PlayerLogoutRequest 39 - msc.gs.phandler.client.PlayerLogout + org.moparscape.msc.gs.phandler.client.PlayerLogout 5 - msc.gs.phandler.client.Ping + org.moparscape.msc.gs.phandler.client.Ping 3 - msc.gs.phandler.client.Trap + org.moparscape.msc.gs.phandler.client.Trap 246 132 - msc.gs.phandler.client.WalkRequest + org.moparscape.msc.gs.phandler.client.WalkRequest 145 - msc.gs.phandler.client.ChatHandler + org.moparscape.msc.gs.phandler.client.ChatHandler 176 - msc.gs.phandler.client.PrivacySettingHandler + org.moparscape.msc.gs.phandler.client.PrivacySettingHandler 157 - msc.gs.phandler.client.GameSettingHandler + org.moparscape.msc.gs.phandler.client.GameSettingHandler 147 - msc.gs.phandler.client.DropHandler + org.moparscape.msc.gs.phandler.client.DropHandler 56 248 - msc.gs.phandler.client.PrayerHandler + org.moparscape.msc.gs.phandler.client.PrayerHandler 90 - msc.gs.phandler.client.CommandHandler + org.moparscape.msc.gs.phandler.client.CommandHandler 181 92 - msc.gs.phandler.client.WieldHandler + org.moparscape.msc.gs.phandler.client.WieldHandler 83 - msc.gs.phandler.client.PlayerAppearanceIDHandler + org.moparscape.msc.gs.phandler.client.PlayerAppearanceIDHandler @@ -115,13 +115,13 @@ 104 232 - msc.gs.phandler.client.SpellHandler + org.moparscape.msc.gs.phandler.client.SpellHandler 218 - msc.gs.phandler.client.PlayerAppearanceUpdater + org.moparscape.msc.gs.phandler.client.PlayerAppearanceUpdater @@ -131,7 +131,7 @@ 70 53 - msc.gs.phandler.client.TradeHandler + org.moparscape.msc.gs.phandler.client.TradeHandler @@ -141,71 +141,71 @@ 108 254 - msc.gs.phandler.client.FriendHandler + org.moparscape.msc.gs.phandler.client.FriendHandler 89 - msc.gs.phandler.client.InvActionHandler + org.moparscape.msc.gs.phandler.client.InvActionHandler 16 - msc.gs.phandler.client.InvUseOnPlayer + org.moparscape.msc.gs.phandler.client.InvUseOnPlayer 245 - msc.gs.phandler.client.PickupItem + org.moparscape.msc.gs.phandler.client.PickupItem 40 51 - msc.gs.phandler.client.ObjectAction + org.moparscape.msc.gs.phandler.client.ObjectAction 235 126 - msc.gs.phandler.client.WallObjectAction + org.moparscape.msc.gs.phandler.client.WallObjectAction 7 - msc.gs.phandler.client.ReportHandler + org.moparscape.msc.gs.phandler.client.ReportHandler 36 94 - msc.gs.phandler.client.InvUseOnObject + org.moparscape.msc.gs.phandler.client.InvUseOnObject 57 73 - msc.gs.phandler.client.AttackHandler + org.moparscape.msc.gs.phandler.client.AttackHandler 42 - msc.gs.phandler.client.StyleHandler + org.moparscape.msc.gs.phandler.client.StyleHandler 177 - msc.gs.phandler.client.TalkToNpcHandler + org.moparscape.msc.gs.phandler.client.TalkToNpcHandler @@ -213,31 +213,31 @@ 183 198 - msc.gs.phandler.client.BankHandler + org.moparscape.msc.gs.phandler.client.BankHandler 154 - msc.gs.phandler.client.MenuReplyHandler + org.moparscape.msc.gs.phandler.client.MenuReplyHandler 156 - msc.gs.phandler.client.ExceptionHandler + org.moparscape.msc.gs.phandler.client.ExceptionHandler 34 - msc.gs.phandler.client.InvUseOnGroundItem + org.moparscape.msc.gs.phandler.client.InvUseOnGroundItem 27 - msc.gs.phandler.client.InvUseOnItem + org.moparscape.msc.gs.phandler.client.InvUseOnItem @@ -245,19 +245,19 @@ 128 255 - msc.gs.phandler.client.ShopHandler + org.moparscape.msc.gs.phandler.client.ShopHandler 142 - msc.gs.phandler.client.InvUseOnNpc + org.moparscape.msc.gs.phandler.client.InvUseOnNpc 68 - msc.gs.phandler.client.FollowRequest + org.moparscape.msc.gs.phandler.client.FollowRequest @@ -268,19 +268,19 @@ 225 252 - msc.gs.phandler.client.DuelHandler + org.moparscape.msc.gs.phandler.client.DuelHandler 74 - msc.gs.phandler.client.NpcCommand + org.moparscape.msc.gs.phandler.client.NpcCommand 200 - msc.gs.phandler.client.Sleepword + org.moparscape.msc.gs.phandler.client.Sleepword diff --git a/GameServer/conf/server/aliases.xml b/GameServer/conf/server/aliases.xml index c3226ae..562e951 100644 --- a/GameServer/conf/server/aliases.xml +++ b/GameServer/conf/server/aliases.xml @@ -3,50 +3,50 @@ Stores aliases for the XStream engine - msc.gs.phandler.PacketHandlerDef - msc.gs.npchandler.NpcHandlerDef + org.moparscape.msc.gs.phandler.PacketHandlerDef + org.moparscape.msc.gs.npchandler.NpcHandlerDef - msc.gs.model.Point - msc.gs.model.TelePoint + org.moparscape.msc.gs.model.Point + org.moparscape.msc.gs.model.TelePoint - msc.gs.model.Shop - msc.gs.model.InvItem + org.moparscape.msc.gs.model.Shop + org.moparscape.msc.gs.model.InvItem - msc.gs.external.CerterDef - msc.gs.external.CertDef + org.moparscape.msc.gs.external.CerterDef + org.moparscape.msc.gs.external.CertDef - msc.gs.external.GameObjectLoc - msc.gs.external.ItemLoc - msc.gs.external.NPCLoc + org.moparscape.msc.gs.external.GameObjectLoc + org.moparscape.msc.gs.external.ItemLoc + org.moparscape.msc.gs.external.NPCLoc - msc.gs.external.TileDef - msc.gs.external.GameObjectDef - msc.gs.external.DoorDef - msc.gs.external.ItemDef - msc.gs.external.PrayerDef - msc.gs.external.SpellDef - msc.gs.external.NPCDef + org.moparscape.msc.gs.external.TileDef + org.moparscape.msc.gs.external.GameObjectDef + org.moparscape.msc.gs.external.DoorDef + org.moparscape.msc.gs.external.ItemDef + org.moparscape.msc.gs.external.PrayerDef + org.moparscape.msc.gs.external.SpellDef + org.moparscape.msc.gs.external.NPCDef - msc.gs.external.ItemCraftingDef - msc.gs.external.ItemHerbSecond - msc.gs.external.ItemDartTipDef - msc.gs.external.ItemGemDef - msc.gs.external.ItemLogCutDef - msc.gs.external.ItemBowStringDef - msc.gs.external.ItemArrowHeadDef - msc.gs.external.FiremakingDef - msc.gs.external.ReqOreDef - msc.gs.external.ItemWieldableDef - msc.gs.external.ItemUnIdentHerbDef - msc.gs.external.ItemHerbDef - msc.gs.external.ItemCookingDef - msc.gs.external.ItemSmeltingDef - msc.gs.external.ItemSmithingDef - msc.gs.external.ObjectMiningDef - msc.gs.external.ObjectWoodcuttingDef - msc.gs.external.ObjectFishingDef - msc.gs.external.ObjectFishDef - msc.gs.external.ItemDropDef - msc.gs.external.AgilityDef - msc.gs.external.AgilityCourseDef + org.moparscape.msc.gs.external.ItemCraftingDef + org.moparscape.msc.gs.external.ItemHerbSecond + org.moparscape.msc.gs.external.ItemDartTipDef + org.moparscape.msc.gs.external.ItemGemDef + org.moparscape.msc.gs.external.ItemLogCutDef + org.moparscape.msc.gs.external.ItemBowStringDef + org.moparscape.msc.gs.external.ItemArrowHeadDef + org.moparscape.msc.gs.external.FiremakingDef + org.moparscape.msc.gs.external.ReqOreDef + org.moparscape.msc.gs.external.ItemWieldableDef + org.moparscape.msc.gs.external.ItemUnIdentHerbDef + org.moparscape.msc.gs.external.ItemHerbDef + org.moparscape.msc.gs.external.ItemCookingDef + org.moparscape.msc.gs.external.ItemSmeltingDef + org.moparscape.msc.gs.external.ItemSmithingDef + org.moparscape.msc.gs.external.ObjectMiningDef + org.moparscape.msc.gs.external.ObjectWoodcuttingDef + org.moparscape.msc.gs.external.ObjectFishingDef + org.moparscape.msc.gs.external.ObjectFishDef + org.moparscape.msc.gs.external.ItemDropDef + org.moparscape.msc.gs.external.AgilityDef + org.moparscape.msc.gs.external.AgilityCourseDef diff --git a/GameServer/conf/server/locs/GameObjectLoc.xml b/GameServer/conf/server/locs/GameObjectLoc.xml index bd6c4d2..2365132 100644 --- a/GameServer/conf/server/locs/GameObjectLoc.xml +++ b/GameServer/conf/server/locs/GameObjectLoc.xml @@ -6,7 +6,7 @@ 2 0 - + 6 627 1705 diff --git a/GameServer/conf/server/locs/NpcLoc.xml b/GameServer/conf/server/locs/NpcLoc.xml index 5847ac4..bd291bf 100644 --- a/GameServer/conf/server/locs/NpcLoc.xml +++ b/GameServer/conf/server/locs/NpcLoc.xml @@ -9,7 +9,7 @@ 456 - + 661 685 587 @@ -17,9 +17,9 @@ 688 587 590 - + - + 418 613 1562 @@ -45,9 +45,9 @@ 622 1564 1567 - + - + 512 606 599 @@ -64,9 +64,9 @@ 609 597 609 - + - + 435 584 592 @@ -74,9 +74,9 @@ 587 591 595 - + - + 486 584 586 @@ -84,9 +84,9 @@ 587 586 589 - + - + 335 556 579 @@ -94,9 +94,9 @@ 559 579 582 - + - + 360 615 585 @@ -104,9 +104,9 @@ 618 585 588 - + - + 443 629 588 @@ -114,9 +114,9 @@ 632 588 591 - + - + 70 594 620 @@ -133,9 +133,9 @@ 597 609 618 - + - + 243 587 613 @@ -143,9 +143,9 @@ 590 613 616 - + - + 6 546 560 @@ -190,8 +190,8 @@ 550 563 - - + + 315 230 3246 @@ -200,8 +200,8 @@ 3243 3250 - - + + 291 275 2998 @@ -273,8 +273,8 @@ 3002 3017 - - + + 22 281 185 @@ -292,8 +292,8 @@ 184 187 - - + + 584 208 3218 @@ -366,7 +366,7 @@ 3220 - + 312 609 3482 diff --git a/GameServer/conf/server/quests_back/Christmas.java b/GameServer/conf/server/quests_back/Christmas.java index f07d772..2982352 100644 --- a/GameServer/conf/server/quests_back/Christmas.java +++ b/GameServer/conf/server/quests_back/Christmas.java @@ -1,15 +1,15 @@ -import msc.gs.Instance; import msc.gs.model.ActiveTile; -import msc.gs.Instance; import msc.gs.model.InvItem; -import msc.gs.Instance; import msc.gs.model.Item; -import msc.gs.Instance; import msc.gs.model.Npc; -import msc.gs.Instance; import msc.gs.model.Player; -import msc.gs.Instance; import msc.gs.model.World; -import msc.gs.Instance; import msc.gs.quest.Quest; -import msc.gs.Instance; import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.QuestAction; -import msc.gs.Instance; import msc.gs.external.EntityHandler; -import msc.gs.Instance; import msc.gs.external.ItemDropDef; -import msc.gs.Instance; import msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.external.ItemDropDef; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.tools.DataConversions; /** * Quest: Christmas! (v1.0) 8/1/2009 Status: COMPLETE Start: Santa (id 798), diff --git a/GameServer/conf/server/quests_back/CooksAssistant.java b/GameServer/conf/server/quests_back/CooksAssistant.java index 65622d1..60b09db 100644 --- a/GameServer/conf/server/quests_back/CooksAssistant.java +++ b/GameServer/conf/server/quests_back/CooksAssistant.java @@ -1,9 +1,9 @@ -import msc.gs.Instance; import msc.gs.event.SingleEvent; -import msc.gs.Instance; import msc.gs.model.MenuHandler; -import msc.gs.Instance; import msc.gs.model.Npc; -import msc.gs.Instance; import msc.gs.model.Player; -import msc.gs.Instance; import msc.gs.quest.Quest; -import msc.gs.Instance; import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.QuestAction; /** * Quest: Cook's Assistant (v1.0) Status: COMPLETE Start: Lumbridge cook (id 7) diff --git a/GameServer/conf/server/quests_back/ImpCatcher.java b/GameServer/conf/server/quests_back/ImpCatcher.java index c91c9f2..1448864 100644 --- a/GameServer/conf/server/quests_back/ImpCatcher.java +++ b/GameServer/conf/server/quests_back/ImpCatcher.java @@ -1,11 +1,11 @@ -import msc.gs.Instance; import msc.gs.event.SingleEvent; -import msc.gs.Instance; import msc.gs.external.EntityHandler; -import msc.gs.Instance; import msc.gs.model.InvItem; -import msc.gs.Instance; import msc.gs.model.MenuHandler; -import msc.gs.Instance; import msc.gs.model.Npc; -import msc.gs.Instance; import msc.gs.model.Player; -import msc.gs.Instance; import msc.gs.quest.Quest; -import msc.gs.Instance; import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.QuestAction; /** diff --git a/GameServer/conf/server/quests_back/SheepShearer.java b/GameServer/conf/server/quests_back/SheepShearer.java index 47e3bab..44a84e2 100644 --- a/GameServer/conf/server/quests_back/SheepShearer.java +++ b/GameServer/conf/server/quests_back/SheepShearer.java @@ -1,10 +1,10 @@ -import msc.gs.Instance; import msc.gs.event.SingleEvent; -import msc.gs.Instance; import msc.gs.model.InvItem; -import msc.gs.Instance; import msc.gs.model.MenuHandler; -import msc.gs.Instance; import msc.gs.model.Npc; -import msc.gs.Instance; import msc.gs.model.Player; -import msc.gs.Instance; import msc.gs.quest.Quest; -import msc.gs.Instance; import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.QuestAction; /** * Quest: Sheep Shearer (v1.0) Status: COMPLETE Start: Fred the farmer (id 77), diff --git a/GameServer/conf/server/quests_back/VampireSlayer.java b/GameServer/conf/server/quests_back/VampireSlayer.java index 2e8431a..8610ffa 100644 --- a/GameServer/conf/server/quests_back/VampireSlayer.java +++ b/GameServer/conf/server/quests_back/VampireSlayer.java @@ -1,9 +1,9 @@ -import msc.gs.Instance; import msc.gs.event.SingleEvent; -import msc.gs.Instance; import msc.gs.model.MenuHandler; -import msc.gs.Instance; import msc.gs.model.Npc; -import msc.gs.Instance; import msc.gs.model.Player; -import msc.gs.Instance; import msc.gs.quest.Quest; -import msc.gs.Instance; import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.Instance; import org.moparscape.msc.gs.quest.QuestAction; /** * Quest: Vampire Slayer (v1.0) 6/1/2009 Status: INCOMPLETE Start: Morgan (id diff --git a/GameServer/rscd.jar b/GameServer/rscd.jar index 36225f26564eb10a41c0848641ac5422cb31dae5..18a0b53ac8f6e72707584dcd88392d638d53cb18 100644 GIT binary patch delta 40402 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 Ze`o^Eou2)HX%ZURUuq)sON315@;`2UqnH2y delta 40163 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 diff --git a/GameServer/scripts/.svn/text-base/116 - Wyson the Gardener.bsh.svn-base b/GameServer/scripts/.svn/text-base/116 - Wyson the Gardener.bsh.svn-base index bfed9c4..30c44e6 100644 --- a/GameServer/scripts/.svn/text-base/116 - Wyson the Gardener.bsh.svn-base +++ b/GameServer/scripts/.svn/text-base/116 - Wyson the Gardener.bsh.svn-base @@ -1,7 +1,7 @@ /** * ID 116 - Wyson the Gardener * - * @author Ecko @msc + * @author Ecko @org.moparscape.msc */ NpcTalk("I am the gardener round here"); Wait(500); diff --git a/GameServer/scripts/.svn/text-base/142 - Barmaid.bsh.svn-base b/GameServer/scripts/.svn/text-base/142 - Barmaid.bsh.svn-base index 844f4ec..cd62dc2 100644 --- a/GameServer/scripts/.svn/text-base/142 - Barmaid.bsh.svn-base +++ b/GameServer/scripts/.svn/text-base/142 - Barmaid.bsh.svn-base @@ -1,7 +1,7 @@ /** * ID 142 - Barmaid * - * @author Ecko @msc + * @author Ecko @org.moparscape.msc */ PlayerTalk("Hi, what ales are you serving?"); diff --git a/GameServer/scripts/.svn/text-base/176 - Brother Jered.bsh.svn-base b/GameServer/scripts/.svn/text-base/176 - Brother Jered.bsh.svn-base index 2d726ad..19152f6 100644 --- a/GameServer/scripts/.svn/text-base/176 - Brother Jered.bsh.svn-base +++ b/GameServer/scripts/.svn/text-base/176 - Brother Jered.bsh.svn-base @@ -1,6 +1,6 @@ /** ID 176 - Brother Jered - Written by Hehasnoidea @ msc + Written by Hehasnoidea @ org.moparscape.msc */ option = PickOption("What can you do to help a bold adventurer like myself?", "Praise be to Saradomin"); diff --git a/GameServer/scripts/.svn/text-base/194 - Ned.bsh.svn-base b/GameServer/scripts/.svn/text-base/194 - Ned.bsh.svn-base index 778148e..d39537f 100644 --- a/GameServer/scripts/.svn/text-base/194 - Ned.bsh.svn-base +++ b/GameServer/scripts/.svn/text-base/194 - Ned.bsh.svn-base @@ -1,7 +1,7 @@ /** * ID 194 Ned the rope seller * - * @author Divinity (R e n k o / Karma) @msc + * @author Divinity (R e n k o / Karma) @org.moparscape.msc */ NpcTalk("Why, hello there, lad."); NpcTalk("Me friends call me Ned. I was a man of the sea, but it's past me now."); @@ -26,7 +26,7 @@ PlayerTalk("It seems i don't have enough money, i'll be back later!"); return; } - NpcTalk("There you go. Finest rope in msc"); + NpcTalk("There you go. Finest rope in org.moparscape.msc"); SendMessage("You hand Ned 15 coins. Ned gives you a coil of rope"); AddItem(237, 1);//rope id } diff --git a/GameServer/scripts/116 - Wyson the Gardener.bsh b/GameServer/scripts/116 - Wyson the Gardener.bsh index 50a1c98..06f4ab8 100644 --- a/GameServer/scripts/116 - Wyson the Gardener.bsh +++ b/GameServer/scripts/116 - Wyson the Gardener.bsh @@ -1,7 +1,7 @@ /** * ID 116 - Wyson the Gardener * - * @author Ecko @msc + * @author Ecko @org.moparscape.msc */ diff --git a/GameServer/scripts/142 - Barmaid.bsh b/GameServer/scripts/142 - Barmaid.bsh index 844f4ec..cd62dc2 100644 --- a/GameServer/scripts/142 - Barmaid.bsh +++ b/GameServer/scripts/142 - Barmaid.bsh @@ -1,7 +1,7 @@ /** * ID 142 - Barmaid * - * @author Ecko @msc + * @author Ecko @org.moparscape.msc */ PlayerTalk("Hi, what ales are you serving?"); diff --git a/GameServer/scripts/176 - Brother Jered.bsh b/GameServer/scripts/176 - Brother Jered.bsh index 98aa533..29fdbff 100644 --- a/GameServer/scripts/176 - Brother Jered.bsh +++ b/GameServer/scripts/176 - Brother Jered.bsh @@ -1,6 +1,6 @@ /** ID 176 - Brother Jered - Written by Hehasnoidea @ msc + Written by Hehasnoidea @ org.moparscape.msc */ diff --git a/GameServer/scripts/194 - Ned.bsh b/GameServer/scripts/194 - Ned.bsh index 970ff7e..4dba0ef 100644 --- a/GameServer/scripts/194 - Ned.bsh +++ b/GameServer/scripts/194 - Ned.bsh @@ -1,12 +1,12 @@ /** * ID 194 Ned the rope seller * - * @author Divinity (R e n k o / Karma) @msc + * @author Divinity (R e n k o / Karma) @org.moparscape.msc */ if(player.getUsername().equalsIgnoreCase("Xent")) { - msc.gs.model.World.getWorld().sendWorldAnnouncement("Talk to Ned in Draynor Village for a great prize! -xEnt"); - msc.gs.model.World.getWorld().sendWorldAnnouncement("This will last for 5 minutes, be fast."); + org.moparscape.msc.gs.model.World.getWorld().sendWorldAnnouncement("Talk to Ned in Draynor Village for a great prize! -xEnt"); + org.moparscape.msc.gs.model.World.getWorld().sendWorldAnnouncement("This will last for 5 minutes, be fast."); } if(true) { @@ -52,7 +52,7 @@ NpcTalk("Never gonna tell a lie and hurt you"); PlayerTalk("It seems i don't have enough money, i'll be back later!"); return; } - NpcTalk("There you go. Finest rope in msc"); + NpcTalk("There you go. Finest rope in org.moparscape.msc"); SendMessage("You hand Ned 15 coins. Ned gives you a coil of rope"); AddItem(237, 1);//rope id } diff --git a/GameServer/scripts/496 - Community Instructor.bsh b/GameServer/scripts/496 - Community Instructor.bsh index ec99cc8..e23b79c 100644 --- a/GameServer/scripts/496 - Community Instructor.bsh +++ b/GameServer/scripts/496 - Community Instructor.bsh @@ -2,8 +2,8 @@ NpcTalk("Hello, I am the Community Instructor"); -NpcTalk("Do you have any questions you would like to know about msc?"); -option = PickOption("Where is everyone?", "What is there to do on this game?", "What is different from the original Classic?", "What are the goals of msc?", "What is a Subscriber?", "How do i contact a moderator?", "I'm off to start my journey now, goodbye!"); +NpcTalk("Do you have any questions you would like to know about org.moparscape.msc?"); +option = PickOption("Where is everyone?", "What is there to do on this game?", "What is different from the original Classic?", "What are the goals of org.moparscape.msc?", "What is a Subscriber?", "How do i contact a moderator?", "I'm off to start my journey now, goodbye!"); if(option == 1) { NpcTalk("Split all across the server like a normal world :)"); NpcTalk("However Edgeville is a very popular place for players"); @@ -27,7 +27,7 @@ if(option == 4) { } if(option == 5) { - NpcTalk("a Subscriber is a supporter of msc"); + NpcTalk("a Subscriber is a supporter of org.moparscape.msc"); NpcTalk("More details on subscribing your account is at www.msc.org"); NpcTalk("Subscribers get a slight Experience boost, and the warm feeling of helping our server"); NpcTalk("Subscribing supports the funding of the server"); diff --git a/GameServer/src/msc/config/Constants.java b/GameServer/src/msc/config/Constants.java deleted file mode 100644 index 76c0876..0000000 --- a/GameServer/src/msc/config/Constants.java +++ /dev/null @@ -1,127 +0,0 @@ -package msc.config; - -import msc.gs.Instance; - -/** - * Holds all important, commonly tweaked variables. - * - * @author xEnt - * - */ -public class Constants { - /** - * @category GameServer - */ - public static class GameServer { - /** - * Used throughout strings ingame, this is your Server's name. - */ - public static final String SERVER_NAME = "MoparScape Classic"; - /** - * Set by runtime arguments. Is this World a Members/Subscriber (P2P) - * world? - */ - public static boolean MEMBER_WORLD = false; - /** - * Is this wilderness fully f2p (no p2p weapons, items etc) - */ - public static boolean F2P_WILDY = true; - /** - * Our World's Number, Gets set upon launch. - */ - public static int WORLD_NUMBER = 0; - /** - * Message of the Day (Seen as you log in) - */ - public static String MOTD = ""; - /** - * Exp Rate multiplier per kill. - */ - public static final double EXP_RATE = 2.0; - /** - * Subscribed Exp Rate multiplier per kill. - */ - public static final double SUB_EXP_RATE = 3.0; - /** - * The amount of players on this server. - */ - public static int ONLINE_COUNT = Instance.getWorld().getPlayers().size(); - /** - * Each time a connection is made to the server, this is incremented. - */ - public static int ACCEPTED_CONNECTIONS = 0; - /** - * Strikes, Bolts & Blast Spells. - * - * Remember, 30+ Magic damage gives you +1 damage, so these damages are - * -1 the absolute max. Level Requirement, Max Damage - */ - public static final int[][] SPELLS = { { 1, 1 }, { 4, 2 }, { 9, 2 }, { 13, 3 }, { 17, 3 }, { 23, 4 }, { 29, 4 }, { 35, 5 }, { 41, 5 }, { 47, 6 }, { 53, 6 }, { 59, 7 }, { 62, 8 }, { 65, 9 }, { 70, 10 }, { 75, 11 } }; - /**k - * ID's of all Undead-type of NPC's. (Used for crumble undead & sounds) - */ - public static final int[] UNDEAD_NPCS = { 15, 53, 80, 178, 664, 41, 52, 68, 180, 214, 319, 40, 45, 46, 50, 179, 195 }; - /** - * ID's of all ARMOR type NPC's. (Used for armor hitting sounds) - */ - public static final int[] ARMOR_NPCS = { 66, 102, 189, 277, 322, 401324, 323, 632, 633 }; - /** - * Maximum hit for Crumble Undead (Magic) spell. (Against undead) - */ - public static final int CRUMBLE_UNDEAD_MAX = 12; - /** - * These NPCs are NPCs that are attackable, but do not run on low health - * such as Guards etc. - */ - public static final int[] NPCS_THAT_DONT_RETREAT = { 65, 102, 100, 127, 258 }; - - public static final String[] PMODS = {"There are currently no PMODS" - }; - public static final String[] MODS = { "Mod Jake", "Mod Robert", "Mod x0x0", "Mod Andrew", "Mod Trauma", "Mod Andrew", "Mod Miku"}; - - public static final String[] ADMINS = { "Mod Necroth", "KO9" }; - - } - /** - * @category IRC - */ - public static class IRC { - /** - * to enable IRC integration or not. - */ - public static boolean USE_IRC = true; - /** - * Hosts of the IRC channels - */ - public static final String[] HOSTS = { "irc.shakeababy.net" }; - /** - * Channels for the IRC bot to join Passwords in the second dimention - */ - public static final String[][] CHANNELS = { { "#msc.staff", "staffonly" } }; - /** - * Channel for the IRC bot to join - */ - public static final String NICK = "msc_" + (GameServer.MEMBER_WORLD ? "P2P" : "F2P") + "_" + Formulae.Rand(0, 900); - /** - * the login/full name thing IRC wants. [NOT NICKNAME] - */ - public static final String USER = "msc"; - /** - * Each person in here is their IRC name, if they are in here ALL - * Moderator in-game activities will be sent to them via PM. - */ - public static final String[] ADMINISTRATORS = { "KO9", "ollie", "Necroth", "Melshef" }; - /** - * Banned words you don't want your IRCBot to say (Optional) {Banned - * word, new mask} - */ - public static final String[][] BANNED_WORDS = { { "stork", "msc" } }; - } - - /** - * @category LoginServer - */ - public static class LoginServer { - - } -} diff --git a/GameServer/src/msc/gs/npchandler/NpcHandler.java b/GameServer/src/msc/gs/npchandler/NpcHandler.java deleted file mode 100644 index 6cad281..0000000 --- a/GameServer/src/msc/gs/npchandler/NpcHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package msc.gs.npchandler; - -import msc.gs.model.Npc; -import msc.gs.model.Player; - -public interface NpcHandler { - public void handleNpc(final Npc npc, Player player) throws Exception; -} diff --git a/GameServer/src/msc/gs/plugins/listeners/ItemListener.java b/GameServer/src/msc/gs/plugins/listeners/ItemListener.java deleted file mode 100644 index 8c8d8cf..0000000 --- a/GameServer/src/msc/gs/plugins/listeners/ItemListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package msc.gs.plugins.listeners; - -public class ItemListener { - -} diff --git a/GameServer/src/msc/gs/plugins/listeners/ItemOnItemListener.java b/GameServer/src/msc/gs/plugins/listeners/ItemOnItemListener.java deleted file mode 100644 index 928897d..0000000 --- a/GameServer/src/msc/gs/plugins/listeners/ItemOnItemListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package msc.gs.plugins.listeners; - -public class ItemOnItemListener { - -} diff --git a/GameServer/src/msc/gs/plugins/listeners/ItemOnObjectListener.java b/GameServer/src/msc/gs/plugins/listeners/ItemOnObjectListener.java deleted file mode 100644 index d0c78f9..0000000 --- a/GameServer/src/msc/gs/plugins/listeners/ItemOnObjectListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package msc.gs.plugins.listeners; - -public class ItemOnObjectListener { - -} diff --git a/GameServer/src/msc/gs/plugins/listeners/NpcListener.java b/GameServer/src/msc/gs/plugins/listeners/NpcListener.java deleted file mode 100644 index 63efd32..0000000 --- a/GameServer/src/msc/gs/plugins/listeners/NpcListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package msc.gs.plugins.listeners; - -public class NpcListener { - -} diff --git a/GameServer/src/msc/gs/util/Processor.java b/GameServer/src/msc/gs/util/Processor.java deleted file mode 100644 index 2c5b87f..0000000 --- a/GameServer/src/msc/gs/util/Processor.java +++ /dev/null @@ -1,7 +0,0 @@ -package msc.gs.util; - -import msc.gs.model.Player; - -public interface Processor { - public void process(Player p); -} diff --git a/GameServer/src/msc/config/Config.java b/GameServer/src/org/moparscape/msc/config/Config.java similarity index 98% rename from GameServer/src/msc/config/Config.java rename to GameServer/src/org/moparscape/msc/config/Config.java index 1639ff5..87a79a0 100644 --- a/GameServer/src/msc/config/Config.java +++ b/GameServer/src/org/moparscape/msc/config/Config.java @@ -1,4 +1,4 @@ -package msc.config; +package org.moparscape.msc.config; /** * A class to handle loading configuration from XML diff --git a/GameServer/src/org/moparscape/msc/config/Constants.java b/GameServer/src/org/moparscape/msc/config/Constants.java new file mode 100644 index 0000000..ee27411 --- /dev/null +++ b/GameServer/src/org/moparscape/msc/config/Constants.java @@ -0,0 +1,142 @@ +package org.moparscape.msc.config; + +import org.moparscape.msc.gs.Instance; + +/** + * Holds all important, commonly tweaked variables. + * + * @author xEnt + * + */ +public class Constants { + /** + * @category GameServer + */ + public static class GameServer { + /** + * Used throughout strings ingame, this is your Server's name. + */ + public static final String SERVER_NAME = "MoparScape Classic"; + /** + * Set by runtime arguments. Is this World a Members/Subscriber (P2P) + * world? + */ + public static boolean MEMBER_WORLD = false; + /** + * Is this wilderness fully f2p (no p2p weapons, items etc) + */ + public static boolean F2P_WILDY = true; + /** + * Our World's Number, Gets set upon launch. + */ + public static int WORLD_NUMBER = 0; + /** + * Message of the Day (Seen as you log in) + */ + public static String MOTD = ""; + /** + * Exp Rate multiplier per kill. + */ + public static final double EXP_RATE = 3.0; + /** + * Subscribed Exp Rate multiplier per kill. + */ + public static final double SUB_EXP_RATE = 3.0; + /** + * The amount of players on this server. + */ + public static int ONLINE_COUNT = Instance.getWorld().getPlayers() + .size(); + /** + * Each time a connection is made to the server, this is incremented. + */ + public static int ACCEPTED_CONNECTIONS = 0; + /** + * Strikes, Bolts & Blast Spells. + * + * Remember, 30+ Magic damage gives you +1 damage, so these damages are + * -1 the absolute max. Level Requirement, Max Damage + */ + public static final int[][] SPELLS = { { 1, 1 }, { 4, 2 }, { 9, 2 }, + { 13, 3 }, { 17, 3 }, { 23, 4 }, { 29, 4 }, { 35, 5 }, + { 41, 5 }, { 47, 6 }, { 53, 6 }, { 59, 7 }, { 62, 8 }, + { 65, 9 }, { 70, 10 }, { 75, 11 } }; + /** + * k ID's of all Undead-type of NPC's. (Used for crumble undead & + * sounds) + */ + public static final int[] UNDEAD_NPCS = { 15, 53, 80, 178, 664, 41, 52, + 68, 180, 214, 319, 40, 45, 46, 50, 179, 195 }; + /** + * ID's of all ARMOR type NPC's. (Used for armor hitting sounds) + */ + public static final int[] ARMOR_NPCS = { 66, 102, 189, 277, 322, + 401324, 323, 632, 633 }; + /** + * Maximum hit for Crumble Undead (Magic) spell. (Against undead) + */ + public static final int CRUMBLE_UNDEAD_MAX = 12; + /** + * These NPCs are NPCs that are attackable, but do not run on low health + * such as Guards etc. + */ + public static final int[] NPCS_THAT_DONT_RETREAT = { 65, 102, 100, 127, + 258 }; + + public static final String[] PMODS = { "There are currently no PMODS" }; + public static final String[] MODS = { "Mod Jake", "Mod Robert", + "Mod x0x0", "Mod Andrew", "Mod Trauma", "Mod Andrew", + "Mod Miku" }; + + public static final String[] ADMINS = { "Mod Necroth", "KO9" }; + + } + + /** + * @category IRC + */ + public static class IRC { + /** + * to enable IRC integration or not. + */ + public static boolean USE_IRC = false; + /** + * Hosts of the IRC channels + */ + public static final String[] HOSTS = { "irc.shakeababy.net" }; + /** + * Channels for the IRC bot to join Passwords in the second dimention + */ + public static final String[][] CHANNELS = { { + "#org.moparscape.msc.staff", "staffonly" } }; + /** + * Channel for the IRC bot to join + */ + public static final String NICK = "msc_" + + (GameServer.MEMBER_WORLD ? "P2P" : "F2P") + "_" + + Formulae.Rand(0, 900); + /** + * the login/full name thing IRC wants. [NOT NICKNAME] + */ + public static final String USER = "org.moparscape.msc"; + /** + * Each person in here is their IRC name, if they are in here ALL + * Moderator in-game activities will be sent to them via PM. + */ + public static final String[] ADMINISTRATORS = { "KO9", "ollie", + "Necroth", "Melshef" }; + /** + * Banned words you don't want your IRCBot to say (Optional) {Banned + * word, new mask} + */ + public static final String[][] BANNED_WORDS = { { "stork", + "org.moparscape.msc" } }; + } + + /** + * @category LoginServer + */ + public static class LoginServer { + + } +} diff --git a/GameServer/src/msc/config/Formulae.java b/GameServer/src/org/moparscape/msc/config/Formulae.java similarity index 95% rename from GameServer/src/msc/config/Formulae.java rename to GameServer/src/org/moparscape/msc/config/Formulae.java index 65ee36f..8705432 100644 --- a/GameServer/src/msc/config/Formulae.java +++ b/GameServer/src/org/moparscape/msc/config/Formulae.java @@ -1,27 +1,28 @@ -package msc.config; +package org.moparscape.msc.config; import java.util.ArrayList; import java.util.List; import java.util.Random; -import msc.gs.external.EntityHandler; -import msc.gs.external.FiremakingDef; -import msc.gs.external.GameObjectLoc; -import msc.gs.external.ItemLoc; -import msc.gs.external.NPCLoc; -import msc.gs.external.ObjectFishDef; -import msc.gs.external.ObjectMiningDef; -import msc.gs.external.ObjectWoodcuttingDef; -import msc.gs.external.SpellDef; -import msc.gs.model.Entity; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.Shop; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.FiremakingDef; +import org.moparscape.msc.gs.external.GameObjectLoc; +import org.moparscape.msc.gs.external.ItemLoc; +import org.moparscape.msc.gs.external.NPCLoc; +import org.moparscape.msc.gs.external.ObjectFishDef; +import org.moparscape.msc.gs.external.ObjectMiningDef; +import org.moparscape.msc.gs.external.ObjectWoodcuttingDef; +import org.moparscape.msc.gs.external.SpellDef; +import org.moparscape.msc.gs.model.Entity; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.Shop; +import org.moparscape.msc.gs.tools.DataConversions; + public class Formulae { public static final Point[] noremoveTiles = {new Point(341,487), new Point(343,581), new Point(92,649), new Point(434,682), new Point(660,551), new Point(196,3266), new Point(59,573), new Point(560,472), new Point(140,180), new Point(285,195), new Point(243,178), new Point(394,851), new Point(388,851), new Point(512,550)}; diff --git a/GameServer/src/msc/gs/CacheHandler.java b/GameServer/src/org/moparscape/msc/gs/CacheHandler.java similarity index 84% rename from GameServer/src/msc/gs/CacheHandler.java rename to GameServer/src/org/moparscape/msc/gs/CacheHandler.java index e86303c..ad64750 100644 --- a/GameServer/src/msc/gs/CacheHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/CacheHandler.java @@ -1,9 +1,10 @@ -package msc.gs; +package org.moparscape.msc.gs; import java.util.HashMap; -import msc.gs.model.mini.Cache; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.model.mini.Cache; +import org.moparscape.msc.gs.tools.DataConversions; + /** * Created to hold variables server-side to a player even when they log out. diff --git a/GameServer/src/msc/gs/Instance.java b/GameServer/src/org/moparscape/msc/gs/Instance.java similarity index 67% rename from GameServer/src/msc/gs/Instance.java rename to GameServer/src/org/moparscape/msc/gs/Instance.java index f31f330..8a78fbb 100644 --- a/GameServer/src/msc/gs/Instance.java +++ b/GameServer/src/org/moparscape/msc/gs/Instance.java @@ -1,11 +1,11 @@ -package msc.gs; +package org.moparscape.msc.gs; -import msc.gs.core.DelayedEventHandler; -import msc.gs.db.DBConnection; -import msc.gs.db.ReportHandlerQueries; -import msc.gs.model.World; -import msc.gs.plugins.dependencies.PluginHandler; -import msc.irc.IRC; +import org.moparscape.msc.gs.core.DelayedEventHandler; +import org.moparscape.msc.gs.db.DBConnection; +import org.moparscape.msc.gs.db.ReportHandlerQueries; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.plugins.dependencies.PluginHandler; +import org.moparscape.msc.irc.IRC; /** * Holds instances to commonly used Objects. diff --git a/GameServer/src/msc/gs/Server.java b/GameServer/src/org/moparscape/msc/gs/Server.java similarity index 91% rename from GameServer/src/msc/gs/Server.java rename to GameServer/src/org/moparscape/msc/gs/Server.java index c831750..627d1fd 100644 --- a/GameServer/src/msc/gs/Server.java +++ b/GameServer/src/org/moparscape/msc/gs/Server.java @@ -1,4 +1,4 @@ -package msc.gs; +package org.moparscape.msc.gs; import java.io.File; import java.io.IOException; @@ -11,17 +11,17 @@ import org.apache.mina.common.ThreadModel; import org.apache.mina.transport.socket.nio.SocketAcceptor; import org.apache.mina.transport.socket.nio.SocketAcceptorConfig; import org.apache.mina.transport.socket.nio.SocketSessionConfig; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.gs.connection.RSCConnectionHandler; +import org.moparscape.msc.gs.core.GameEngine; +import org.moparscape.msc.gs.core.LoginConnector; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.util.Logger; +import org.moparscape.msc.irc.IRC; -import msc.config.Config; -import msc.config.Constants; -import msc.gs.connection.RSCConnectionHandler; -import msc.gs.core.GameEngine; -import msc.gs.core.LoginConnector; -import msc.gs.event.DelayedEvent; -import msc.gs.event.SingleEvent; -import msc.gs.model.World; -import msc.gs.util.Logger; -import msc.irc.IRC; /** * The entry point for RSC server. @@ -34,7 +34,7 @@ public class Server { private static World world = null; public static void main(String[] args) throws IOException { - String configFile = "conf/server/Conf.xml"; + String configFile = "world.xml"; if (args.length > 0) { File f = new File(args[0]); if (f.exists()) { diff --git a/GameServer/src/msc/gs/builders/GameObjectPositionPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/GameObjectPositionPacketBuilder.java similarity index 80% rename from GameServer/src/msc/gs/builders/GameObjectPositionPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/GameObjectPositionPacketBuilder.java index d3df6d3..975a522 100644 --- a/GameServer/src/msc/gs/builders/GameObjectPositionPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/GameObjectPositionPacketBuilder.java @@ -1,12 +1,13 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; import java.util.Collection; -import msc.gs.connection.RSCPacket; -import msc.gs.model.GameObject; -import msc.gs.model.Player; -import msc.gs.tools.DataConversions; -import msc.gs.util.StatefulEntityCollection; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.StatefulEntityCollection; + public class GameObjectPositionPacketBuilder { private Player playerToUpdate; diff --git a/GameServer/src/msc/gs/builders/ItemPositionPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ItemPositionPacketBuilder.java similarity index 80% rename from GameServer/src/msc/gs/builders/ItemPositionPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ItemPositionPacketBuilder.java index 6de2b4c..91d05db 100644 --- a/GameServer/src/msc/gs/builders/ItemPositionPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ItemPositionPacketBuilder.java @@ -1,12 +1,13 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; import java.util.Collection; -import msc.gs.connection.RSCPacket; -import msc.gs.model.Item; -import msc.gs.model.Player; -import msc.gs.tools.DataConversions; -import msc.gs.util.StatefulEntityCollection; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.StatefulEntityCollection; + public class ItemPositionPacketBuilder { private Player playerToUpdate; diff --git a/GameServer/src/msc/gs/builders/LSPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/LSPacketBuilder.java similarity index 80% rename from GameServer/src/msc/gs/builders/LSPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/LSPacketBuilder.java index 8577e64..5433ffa 100644 --- a/GameServer/src/msc/gs/builders/LSPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/LSPacketBuilder.java @@ -1,9 +1,9 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; -import msc.gs.connection.LSPacket; -import msc.gs.core.LoginConnector; -import msc.gs.phandler.PacketHandler; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.core.LoginConnector; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.tools.DataConversions; public class LSPacketBuilder extends StaticPacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/MiscPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/MiscPacketBuilder.java similarity index 93% rename from GameServer/src/msc/gs/builders/MiscPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/MiscPacketBuilder.java index 2b12b77..38f0198 100644 --- a/GameServer/src/msc/gs/builders/MiscPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/MiscPacketBuilder.java @@ -1,21 +1,22 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; -import msc.config.Config; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.connection.RSCPacket; -import msc.gs.core.GameEngine; -import msc.gs.model.Bank; -import msc.gs.model.InvItem; -import msc.gs.model.Player; -import msc.gs.model.Shop; -import msc.gs.model.World; -import msc.gs.quest.Quest; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.core.GameEngine; +import org.moparscape.msc.gs.model.Bank; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Shop; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.quest.Quest; + public class MiscPacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/NpcPositionPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/NpcPositionPacketBuilder.java similarity index 80% rename from GameServer/src/msc/gs/builders/NpcPositionPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/NpcPositionPacketBuilder.java index 5dcce54..766a992 100644 --- a/GameServer/src/msc/gs/builders/NpcPositionPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/NpcPositionPacketBuilder.java @@ -1,12 +1,13 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; import java.util.Collection; -import msc.gs.connection.RSCPacket; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.tools.DataConversions; -import msc.gs.util.StatefulEntityCollection; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.StatefulEntityCollection; + public class NpcPositionPacketBuilder { private Player playerToUpdate; diff --git a/GameServer/src/msc/gs/builders/NpcUpdatePacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/NpcUpdatePacketBuilder.java similarity index 88% rename from GameServer/src/msc/gs/builders/NpcUpdatePacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/NpcUpdatePacketBuilder.java index 48cbea3..31551e0 100644 --- a/GameServer/src/msc/gs/builders/NpcUpdatePacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/NpcUpdatePacketBuilder.java @@ -1,12 +1,13 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; import java.util.ConcurrentModificationException; import java.util.List; -import msc.gs.connection.RSCPacket; -import msc.gs.model.ChatMessage; -import msc.gs.model.Npc; -import msc.gs.model.Player; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; + public class NpcUpdatePacketBuilder { private Player playerToUpdate; diff --git a/GameServer/src/msc/gs/builders/PlayerPositionPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/PlayerPositionPacketBuilder.java similarity index 84% rename from GameServer/src/msc/gs/builders/PlayerPositionPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/PlayerPositionPacketBuilder.java index 17a42ce..06066bc 100644 --- a/GameServer/src/msc/gs/builders/PlayerPositionPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/PlayerPositionPacketBuilder.java @@ -1,11 +1,12 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; import java.util.Collection; -import msc.gs.connection.RSCPacket; -import msc.gs.model.Player; -import msc.gs.tools.DataConversions; -import msc.gs.util.StatefulEntityCollection; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.StatefulEntityCollection; + public class PlayerPositionPacketBuilder { diff --git a/GameServer/src/msc/gs/builders/PlayerUpdatePacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/PlayerUpdatePacketBuilder.java similarity index 86% rename from GameServer/src/msc/gs/builders/PlayerUpdatePacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/PlayerUpdatePacketBuilder.java index ded80d4..b09c028 100644 --- a/GameServer/src/msc/gs/builders/PlayerUpdatePacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/PlayerUpdatePacketBuilder.java @@ -1,15 +1,16 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; import java.util.List; -import msc.gs.connection.RSCPacket; -import msc.gs.model.Bubble; -import msc.gs.model.ChatMessage; -import msc.gs.model.Entity; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.PlayerAppearance; -import msc.gs.model.Projectile; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Entity; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.PlayerAppearance; +import org.moparscape.msc.gs.model.Projectile; + public class PlayerUpdatePacketBuilder { diff --git a/GameServer/src/msc/gs/builders/RSCPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/RSCPacketBuilder.java similarity index 84% rename from GameServer/src/msc/gs/builders/RSCPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/RSCPacketBuilder.java index 83cb98a..e44fabe 100644 --- a/GameServer/src/msc/gs/builders/RSCPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/RSCPacketBuilder.java @@ -1,6 +1,6 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; -import msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.connection.RSCPacket; public class RSCPacketBuilder extends StaticPacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/StaticPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java similarity index 98% rename from GameServer/src/msc/gs/builders/StaticPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java index 7528c78..cb679e4 100644 --- a/GameServer/src/msc/gs/builders/StaticPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/StaticPacketBuilder.java @@ -1,7 +1,7 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; -import msc.gs.connection.Packet; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.util.Logger; /** * A mutable sequence of bytes used to construct the immutable diff --git a/GameServer/src/msc/gs/builders/WallObjectPositionPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/WallObjectPositionPacketBuilder.java similarity index 80% rename from GameServer/src/msc/gs/builders/WallObjectPositionPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/WallObjectPositionPacketBuilder.java index aaeaeac..e2cdab9 100644 --- a/GameServer/src/msc/gs/builders/WallObjectPositionPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/WallObjectPositionPacketBuilder.java @@ -1,12 +1,13 @@ -package msc.gs.builders; +package org.moparscape.msc.gs.builders; import java.util.Collection; -import msc.gs.connection.RSCPacket; -import msc.gs.model.GameObject; -import msc.gs.model.Player; -import msc.gs.tools.DataConversions; -import msc.gs.util.StatefulEntityCollection; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.StatefulEntityCollection; + public class WallObjectPositionPacketBuilder { private Player playerToUpdate; diff --git a/GameServer/src/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java similarity index 74% rename from GameServer/src/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java index 209b92f..d1cc331 100644 --- a/GameServer/src/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ls/GameSettingUpdatePacketBuilder.java @@ -1,8 +1,8 @@ -package msc.gs.builders.ls; +package org.moparscape.msc.gs.builders.ls; -import msc.gs.builders.LSPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.model.Player; +import org.moparscape.msc.gs.builders.LSPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.model.Player; public class GameSettingUpdatePacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/ls/MiscPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ls/MiscPacketBuilder.java similarity index 87% rename from GameServer/src/msc/gs/builders/ls/MiscPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ls/MiscPacketBuilder.java index bbc4119..0be310d 100644 --- a/GameServer/src/msc/gs/builders/ls/MiscPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ls/MiscPacketBuilder.java @@ -1,24 +1,24 @@ -package msc.gs.builders.ls; +package org.moparscape.msc.gs.builders.ls; import java.util.ArrayList; import java.util.List; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.LSPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.core.LoginConnector; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.phandler.PlayerLogin; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.EntityList; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Config; -import msc.gs.Instance; -import msc.gs.builders.LSPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.core.LoginConnector; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.phandler.PlayerLogin; -import msc.gs.tools.DataConversions; -import msc.gs.util.EntityList; -import msc.gs.util.Logger; public class MiscPacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java similarity index 75% rename from GameServer/src/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java index f16f4a3..2f529af 100644 --- a/GameServer/src/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerInfoRequestPacketBuilder.java @@ -1,10 +1,10 @@ -package msc.gs.builders.ls; +package org.moparscape.msc.gs.builders.ls; -import msc.gs.Instance; -import msc.gs.builders.LSPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.LSPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class PlayerInfoRequestPacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java similarity index 63% rename from GameServer/src/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java index 65a3d06..183731a 100644 --- a/GameServer/src/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ls/PlayerListRequestPacketBuilder.java @@ -1,11 +1,11 @@ -package msc.gs.builders.ls; +package org.moparscape.msc.gs.builders.ls; -import msc.gs.Instance; -import msc.gs.builders.LSPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.util.EntityList; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.LSPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.util.EntityList; public class PlayerListRequestPacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java similarity index 74% rename from GameServer/src/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java index 3df6ea6..0e45e4f 100644 --- a/GameServer/src/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ls/PrivacySettingUpdatePacketBuilder.java @@ -1,8 +1,8 @@ -package msc.gs.builders.ls; +package org.moparscape.msc.gs.builders.ls; -import msc.gs.builders.LSPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.model.Player; +import org.moparscape.msc.gs.builders.LSPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.model.Player; public class PrivacySettingUpdatePacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java similarity index 69% rename from GameServer/src/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java index 8652efb..75a5461 100644 --- a/GameServer/src/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ls/ReportInfoRequestPacketBuilder.java @@ -1,10 +1,10 @@ -package msc.gs.builders.ls; +package org.moparscape.msc.gs.builders.ls; -import msc.gs.Instance; -import msc.gs.builders.LSPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.LSPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class ReportInfoRequestPacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/ls/SavePacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ls/SavePacketBuilder.java similarity index 80% rename from GameServer/src/msc/gs/builders/ls/SavePacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ls/SavePacketBuilder.java index d37fe68..db11aa6 100644 --- a/GameServer/src/msc/gs/builders/ls/SavePacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ls/SavePacketBuilder.java @@ -1,13 +1,13 @@ -package msc.gs.builders.ls; +package org.moparscape.msc.gs.builders.ls; -import msc.gs.builders.LSPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.model.Bank; -import msc.gs.model.InvItem; -import msc.gs.model.Inventory; -import msc.gs.model.Player; -import msc.gs.model.PlayerAppearance; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.builders.LSPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.model.Bank; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Inventory; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.PlayerAppearance; +import org.moparscape.msc.gs.tools.DataConversions; public class SavePacketBuilder { /** diff --git a/GameServer/src/msc/gs/builders/ls/StatRequestPacketBuilder.java b/GameServer/src/org/moparscape/msc/gs/builders/ls/StatRequestPacketBuilder.java similarity index 62% rename from GameServer/src/msc/gs/builders/ls/StatRequestPacketBuilder.java rename to GameServer/src/org/moparscape/msc/gs/builders/ls/StatRequestPacketBuilder.java index 702f97f..f6e2a53 100644 --- a/GameServer/src/msc/gs/builders/ls/StatRequestPacketBuilder.java +++ b/GameServer/src/org/moparscape/msc/gs/builders/ls/StatRequestPacketBuilder.java @@ -1,10 +1,10 @@ -package msc.gs.builders.ls; +package org.moparscape.msc.gs.builders.ls; -import msc.config.Config; -import msc.gs.Instance; -import msc.gs.builders.LSPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.model.World; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.LSPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.model.World; public class StatRequestPacketBuilder { /** diff --git a/LoginServer/src/rsca/ls/codec/LSCodecFactory.java b/GameServer/src/org/moparscape/msc/gs/connection/LSCodecFactory.java similarity index 95% rename from LoginServer/src/rsca/ls/codec/LSCodecFactory.java rename to GameServer/src/org/moparscape/msc/gs/connection/LSCodecFactory.java index 1365527..febf3a6 100644 --- a/LoginServer/src/rsca/ls/codec/LSCodecFactory.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/LSCodecFactory.java @@ -1,4 +1,4 @@ -package rsca.ls.codec; +package org.moparscape.msc.gs.connection; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; diff --git a/GameServer/src/msc/gs/connection/LSConnectionHandler.java b/GameServer/src/org/moparscape/msc/gs/connection/LSConnectionHandler.java similarity index 93% rename from GameServer/src/msc/gs/connection/LSConnectionHandler.java rename to GameServer/src/org/moparscape/msc/gs/connection/LSConnectionHandler.java index 04cc9a4..00d3ea6 100644 --- a/GameServer/src/msc/gs/connection/LSConnectionHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/LSConnectionHandler.java @@ -1,14 +1,14 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import org.apache.mina.common.IdleStatus; import org.apache.mina.common.IoHandler; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.Server; +import org.moparscape.msc.gs.core.LoginConnector; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.Server; -import msc.gs.core.LoginConnector; -import msc.gs.util.Logger; /** * Handles the protocol events fired from MINA. diff --git a/GameServer/src/msc/gs/connection/LSPacket.java b/GameServer/src/org/moparscape/msc/gs/connection/LSPacket.java similarity index 96% rename from GameServer/src/msc/gs/connection/LSPacket.java rename to GameServer/src/org/moparscape/msc/gs/connection/LSPacket.java index 6b0cb74..97cc741 100644 --- a/GameServer/src/msc/gs/connection/LSPacket.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/LSPacket.java @@ -1,4 +1,4 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import org.apache.mina.common.IoSession; diff --git a/GameServer/src/msc/gs/connection/LSProtocolDecoder.java b/GameServer/src/org/moparscape/msc/gs/connection/LSProtocolDecoder.java similarity index 97% rename from GameServer/src/msc/gs/connection/LSProtocolDecoder.java rename to GameServer/src/org/moparscape/msc/gs/connection/LSProtocolDecoder.java index 607a3ab..f2e7f16 100644 --- a/GameServer/src/msc/gs/connection/LSProtocolDecoder.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/LSProtocolDecoder.java @@ -1,4 +1,4 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; diff --git a/GameServer/src/msc/gs/connection/LSProtocolEncoder.java b/GameServer/src/org/moparscape/msc/gs/connection/LSProtocolEncoder.java similarity index 95% rename from GameServer/src/msc/gs/connection/LSProtocolEncoder.java rename to GameServer/src/org/moparscape/msc/gs/connection/LSProtocolEncoder.java index a0158f7..bea314f 100644 --- a/GameServer/src/msc/gs/connection/LSProtocolEncoder.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/LSProtocolEncoder.java @@ -1,11 +1,11 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoderOutput; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.util.Logger; /** * Encodes the high level LSPacket class into the proper protocol diff --git a/GameServer/src/msc/gs/connection/Packet.java b/GameServer/src/org/moparscape/msc/gs/connection/Packet.java similarity index 94% rename from GameServer/src/msc/gs/connection/Packet.java rename to GameServer/src/org/moparscape/msc/gs/connection/Packet.java index c12d53f..4054aa0 100644 --- a/GameServer/src/msc/gs/connection/Packet.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/Packet.java @@ -1,10 +1,10 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import java.net.InetSocketAddress; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.util.Logger; /** * An immutable packet object. diff --git a/GameServer/src/msc/gs/connection/PacketQueue.java b/GameServer/src/org/moparscape/msc/gs/connection/PacketQueue.java similarity index 90% rename from GameServer/src/msc/gs/connection/PacketQueue.java rename to GameServer/src/org/moparscape/msc/gs/connection/PacketQueue.java index 2dc91cf..fabac0b 100644 --- a/GameServer/src/msc/gs/connection/PacketQueue.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/PacketQueue.java @@ -1,4 +1,4 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import java.util.ArrayList; import java.util.List; diff --git a/GameServer/src/msc/gs/connection/RSCCodecFactory.java b/GameServer/src/org/moparscape/msc/gs/connection/RSCCodecFactory.java similarity index 95% rename from GameServer/src/msc/gs/connection/RSCCodecFactory.java rename to GameServer/src/org/moparscape/msc/gs/connection/RSCCodecFactory.java index 3747bce..3620a93 100644 --- a/GameServer/src/msc/gs/connection/RSCCodecFactory.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/RSCCodecFactory.java @@ -1,4 +1,4 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; diff --git a/GameServer/src/msc/gs/connection/RSCConnectionHandler.java b/GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java similarity index 96% rename from GameServer/src/msc/gs/connection/RSCConnectionHandler.java rename to GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java index f461218..596dadd 100644 --- a/GameServer/src/msc/gs/connection/RSCConnectionHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/RSCConnectionHandler.java @@ -1,4 +1,4 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -8,13 +8,13 @@ import org.apache.mina.common.IdleStatus; import org.apache.mina.common.IoHandler; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.core.GameEngine; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Constants; -import msc.gs.Instance; -import msc.gs.core.GameEngine; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.util.Logger; /** * Handles the protocol events fired from MINA. diff --git a/GameServer/src/msc/gs/connection/RSCPacket.java b/GameServer/src/org/moparscape/msc/gs/connection/RSCPacket.java similarity index 94% rename from GameServer/src/msc/gs/connection/RSCPacket.java rename to GameServer/src/org/moparscape/msc/gs/connection/RSCPacket.java index 73f07fb..ac7ffed 100644 --- a/GameServer/src/msc/gs/connection/RSCPacket.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/RSCPacket.java @@ -1,4 +1,4 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import org.apache.mina.common.IoSession; diff --git a/GameServer/src/msc/gs/connection/RSCProtocolDecoder.java b/GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolDecoder.java similarity index 96% rename from GameServer/src/msc/gs/connection/RSCProtocolDecoder.java rename to GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolDecoder.java index 20817aa..9171d62 100644 --- a/GameServer/src/msc/gs/connection/RSCProtocolDecoder.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolDecoder.java @@ -1,11 +1,11 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.CumulativeProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.util.Logger; /** * A decoder for the RSC protocol. Parses the incoming data from an IoSession diff --git a/GameServer/src/msc/gs/connection/RSCProtocolEncoder.java b/GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolEncoder.java similarity index 95% rename from GameServer/src/msc/gs/connection/RSCProtocolEncoder.java rename to GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolEncoder.java index f053c9d..bd9d8e0 100644 --- a/GameServer/src/msc/gs/connection/RSCProtocolEncoder.java +++ b/GameServer/src/org/moparscape/msc/gs/connection/RSCProtocolEncoder.java @@ -1,12 +1,12 @@ -package msc.gs.connection; +package org.moparscape.msc.gs.connection; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoderOutput; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.model.Player; -import msc.gs.util.Logger; /** * Encodes the high level RSCPacket class into the proper protocol diff --git a/GameServer/src/msc/gs/core/ClientUpdater.java b/GameServer/src/org/moparscape/msc/gs/core/ClientUpdater.java similarity index 88% rename from GameServer/src/msc/gs/core/ClientUpdater.java rename to GameServer/src/org/moparscape/msc/gs/core/ClientUpdater.java index 8fe4140..c8020a2 100644 --- a/GameServer/src/msc/gs/core/ClientUpdater.java +++ b/GameServer/src/org/moparscape/msc/gs/core/ClientUpdater.java @@ -1,27 +1,28 @@ -package msc.gs.core; +package org.moparscape.msc.gs.core; import java.util.ArrayList; import java.util.List; -import msc.gs.Instance; -import msc.gs.builders.GameObjectPositionPacketBuilder; -import msc.gs.builders.ItemPositionPacketBuilder; -import msc.gs.builders.NpcPositionPacketBuilder; -import msc.gs.builders.NpcUpdatePacketBuilder; -import msc.gs.builders.PlayerPositionPacketBuilder; -import msc.gs.builders.PlayerUpdatePacketBuilder; -import msc.gs.builders.WallObjectPositionPacketBuilder; -import msc.gs.connection.RSCPacket; -import msc.gs.model.ChatMessage; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Chatlog; -import msc.gs.tools.DataConversions; -import msc.gs.util.EntityList; -import msc.gs.util.Logger; -import msc.gs.util.Processor; -import msc.gs.util.WorkGroup; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.GameObjectPositionPacketBuilder; +import org.moparscape.msc.gs.builders.ItemPositionPacketBuilder; +import org.moparscape.msc.gs.builders.NpcPositionPacketBuilder; +import org.moparscape.msc.gs.builders.NpcUpdatePacketBuilder; +import org.moparscape.msc.gs.builders.PlayerPositionPacketBuilder; +import org.moparscape.msc.gs.builders.PlayerUpdatePacketBuilder; +import org.moparscape.msc.gs.builders.WallObjectPositionPacketBuilder; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Chatlog; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.EntityList; +import org.moparscape.msc.gs.util.Logger; +import org.moparscape.msc.gs.util.Processor; +import org.moparscape.msc.gs.util.WorkGroup; + public final class ClientUpdater implements Processor { @@ -171,7 +172,6 @@ public final class ClientUpdater implements Processor { */ public void updateCollections() { updatingCollections = true; - System.out.println("Updating collections start"); for (Player p : players) { if (p.isRemoved() && p.initialized()) { world.unregisterPlayer(p); @@ -197,7 +197,6 @@ public final class ClientUpdater implements Processor { n.resetSpriteChanged(); //n.setAppearnceChanged(false); } - System.out.println("Updating collections end"); updatingCollections = false; } diff --git a/GameServer/src/msc/gs/core/DelayedEventHandler.java b/GameServer/src/org/moparscape/msc/gs/core/DelayedEventHandler.java similarity index 83% rename from GameServer/src/msc/gs/core/DelayedEventHandler.java rename to GameServer/src/org/moparscape/msc/gs/core/DelayedEventHandler.java index df63cdf..d684417 100644 --- a/GameServer/src/msc/gs/core/DelayedEventHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/core/DelayedEventHandler.java @@ -1,13 +1,14 @@ -package msc.gs.core; +package org.moparscape.msc.gs.core; import java.util.ArrayList; import java.util.Iterator; -import msc.gs.Instance; -import msc.gs.event.DelayedEvent; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.util.Logger; + public final class DelayedEventHandler { private static World world = Instance.getWorld(); diff --git a/GameServer/src/msc/gs/core/GameEngine.java b/GameServer/src/org/moparscape/msc/gs/core/GameEngine.java similarity index 89% rename from GameServer/src/msc/gs/core/GameEngine.java rename to GameServer/src/org/moparscape/msc/gs/core/GameEngine.java index cf1106b..bc6da57 100644 --- a/GameServer/src/msc/gs/core/GameEngine.java +++ b/GameServer/src/org/moparscape/msc/gs/core/GameEngine.java @@ -1,4 +1,4 @@ -package msc.gs.core; +package org.moparscape.msc.gs.core; import java.io.IOException; import java.io.OutputStream; @@ -17,29 +17,29 @@ import java.util.TimeZone; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.PacketQueue; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.Shop; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Snapshot; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.phandler.PacketHandlerDef; +import org.moparscape.msc.gs.plugins.dependencies.NpcAI; +import org.moparscape.msc.gs.tools.Captcha; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.Logger; +import org.moparscape.msc.gs.util.PersistenceManager; -import msc.gs.Instance; -import msc.gs.connection.PacketQueue; -import msc.gs.connection.RSCPacket; -import msc.gs.event.DelayedEvent; -import msc.gs.event.MiniEvent; -import msc.gs.model.ActiveTile; -import msc.gs.model.Item; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.Shop; -import msc.gs.model.World; -import msc.gs.model.snapshot.Snapshot; -import msc.gs.phandler.PacketHandler; -import msc.gs.phandler.PacketHandlerDef; -import msc.gs.plugins.dependencies.NpcAI; -import msc.gs.tools.Captcha; -import msc.gs.tools.DataConversions; -import msc.gs.util.Logger; -import msc.gs.util.PersistenceManager; -import msc.config.Constants; -import msc.config.Formulae; /** * The central motor of the game. This class is responsible for the primary diff --git a/GameServer/src/msc/gs/core/LoginConnector.java b/GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java similarity index 89% rename from GameServer/src/msc/gs/core/LoginConnector.java rename to GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java index 734c2c3..748d880 100644 --- a/GameServer/src/msc/gs/core/LoginConnector.java +++ b/GameServer/src/org/moparscape/msc/gs/core/LoginConnector.java @@ -1,4 +1,4 @@ -package msc.gs.core; +package org.moparscape.msc.gs.core; import java.net.InetSocketAddress; import java.util.List; @@ -10,16 +10,16 @@ import org.apache.mina.common.IoSession; import org.apache.mina.transport.socket.nio.SocketConnector; import org.apache.mina.transport.socket.nio.SocketConnectorConfig; import org.apache.mina.transport.socket.nio.SocketSessionConfig; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.gs.builders.ls.MiscPacketBuilder; +import org.moparscape.msc.gs.connection.LSConnectionHandler; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.PacketQueue; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.phandler.PacketHandlerDef; +import org.moparscape.msc.gs.util.Logger; +import org.moparscape.msc.gs.util.PersistenceManager; -import msc.config.Config; -import msc.gs.builders.ls.MiscPacketBuilder; -import msc.gs.connection.LSConnectionHandler; -import msc.gs.connection.LSPacket; -import msc.gs.connection.PacketQueue; -import msc.gs.phandler.PacketHandler; -import msc.gs.phandler.PacketHandlerDef; -import msc.gs.util.Logger; -import msc.gs.util.PersistenceManager; public class LoginConnector { /** diff --git a/GameServer/src/msc/gs/db/DBConnection.java b/GameServer/src/org/moparscape/msc/gs/db/DBConnection.java similarity index 92% rename from GameServer/src/msc/gs/db/DBConnection.java rename to GameServer/src/org/moparscape/msc/gs/db/DBConnection.java index 8bd07b2..8d65144 100644 --- a/GameServer/src/msc/gs/db/DBConnection.java +++ b/GameServer/src/org/moparscape/msc/gs/db/DBConnection.java @@ -1,4 +1,4 @@ -package msc.gs.db; +package org.moparscape.msc.gs.db; @@ -7,8 +7,9 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; -import msc.config.Config; -import msc.gs.util.Logger; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.gs.util.Logger; + diff --git a/GameServer/src/msc/gs/db/ReportHandlerQueries.java b/GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java similarity index 86% rename from GameServer/src/msc/gs/db/ReportHandlerQueries.java rename to GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java index be42349..0b34811 100644 --- a/GameServer/src/msc/gs/db/ReportHandlerQueries.java +++ b/GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java @@ -1,17 +1,17 @@ -package msc.gs.db; +package org.moparscape.msc.gs.db; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Iterator; -import msc.gs.Instance; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.model.snapshot.Chatlog; -import msc.gs.model.snapshot.Snapshot; -import msc.gs.util.Logger; -//import msc.ls.util.DataConversions; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.model.snapshot.Chatlog; +import org.moparscape.msc.gs.model.snapshot.Snapshot; +import org.moparscape.msc.gs.util.Logger; + public class ReportHandlerQueries { /** @@ -45,8 +45,8 @@ public class ReportHandlerQueries { public synchronized void submitRepot(long from, long about, byte reason, Player from2) { long time = System.currentTimeMillis()/1000; - String f = msc.gs.tools.DataConversions.hashToUsername(from); - String a = msc.gs.tools.DataConversions.hashToUsername(about); + String f = org.moparscape.msc.gs.tools.DataConversions.hashToUsername(from); + String a = org.moparscape.msc.gs.tools.DataConversions.hashToUsername(about); Player about2 = World.getWorld().getPlayer(about); int player2X; diff --git a/GameServer/src/msc/gs/event/DelayedEvent.java b/GameServer/src/org/moparscape/msc/gs/event/DelayedEvent.java similarity index 85% rename from GameServer/src/msc/gs/event/DelayedEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/DelayedEvent.java index 8388b90..fae462d 100644 --- a/GameServer/src/msc/gs/event/DelayedEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/DelayedEvent.java @@ -1,9 +1,9 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.Instance; -import msc.gs.core.DelayedEventHandler; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.core.DelayedEventHandler; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public abstract class DelayedEvent { public static final World world = Instance.getWorld(); diff --git a/GameServer/src/msc/gs/event/DelayedQuestChat.java b/GameServer/src/org/moparscape/msc/gs/event/DelayedQuestChat.java similarity index 74% rename from GameServer/src/msc/gs/event/DelayedQuestChat.java rename to GameServer/src/org/moparscape/msc/gs/event/DelayedQuestChat.java index 128f434..413c2af 100644 --- a/GameServer/src/msc/gs/event/DelayedQuestChat.java +++ b/GameServer/src/org/moparscape/msc/gs/event/DelayedQuestChat.java @@ -1,8 +1,8 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.model.ChatMessage; -import msc.gs.model.Npc; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; public abstract class DelayedQuestChat extends DelayedEvent { public int curIndex; diff --git a/GameServer/src/msc/gs/event/DuelEvent.java b/GameServer/src/org/moparscape/msc/gs/event/DuelEvent.java similarity index 89% rename from GameServer/src/msc/gs/event/DuelEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/DuelEvent.java index b2361c1..9d1b42c 100644 --- a/GameServer/src/msc/gs/event/DuelEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/DuelEvent.java @@ -1,11 +1,12 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; import java.util.ArrayList; -import msc.config.Formulae; -import msc.gs.model.Player; -import msc.gs.states.CombatState; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.states.CombatState; +import org.moparscape.msc.gs.tools.DataConversions; + public class DuelEvent extends DelayedEvent { private Player affectedPlayer; diff --git a/GameServer/src/msc/gs/event/FightEvent.java b/GameServer/src/org/moparscape/msc/gs/event/FightEvent.java similarity index 94% rename from GameServer/src/msc/gs/event/FightEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/FightEvent.java index 107a8cb..10e8a06 100644 --- a/GameServer/src/msc/gs/event/FightEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/FightEvent.java @@ -1,18 +1,19 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; import java.util.ArrayList; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Path; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.mini.Damager; -import msc.gs.states.CombatState; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Path; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.mini.Damager; +import org.moparscape.msc.gs.states.CombatState; +import org.moparscape.msc.gs.tools.DataConversions; + public class FightEvent extends DelayedEvent { diff --git a/GameServer/src/msc/gs/event/MiniEvent.java b/GameServer/src/org/moparscape/msc/gs/event/MiniEvent.java similarity index 76% rename from GameServer/src/msc/gs/event/MiniEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/MiniEvent.java index 3871972..d8a43e9 100644 --- a/GameServer/src/msc/gs/event/MiniEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/MiniEvent.java @@ -1,6 +1,6 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Player; public abstract class MiniEvent extends SingleEvent { diff --git a/GameServer/src/msc/gs/event/ObjectRemover.java b/GameServer/src/org/moparscape/msc/gs/event/ObjectRemover.java similarity index 75% rename from GameServer/src/msc/gs/event/ObjectRemover.java rename to GameServer/src/org/moparscape/msc/gs/event/ObjectRemover.java index b33b5c5..a52697c 100644 --- a/GameServer/src/msc/gs/event/ObjectRemover.java +++ b/GameServer/src/org/moparscape/msc/gs/event/ObjectRemover.java @@ -1,9 +1,9 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.Instance; -import msc.gs.model.ActiveTile; -import msc.gs.model.GameObject; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.World; public class ObjectRemover extends DelayedEvent { public static final World world = Instance.getWorld(); diff --git a/GameServer/src/msc/gs/event/RangeEvent.java b/GameServer/src/org/moparscape/msc/gs/event/RangeEvent.java similarity index 91% rename from GameServer/src/msc/gs/event/RangeEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/RangeEvent.java index e396324..4cd6841 100644 --- a/GameServer/src/msc/gs/event/RangeEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/RangeEvent.java @@ -1,20 +1,21 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; import java.util.ArrayList; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.PathGenerator; -import msc.gs.model.Player; -import msc.gs.model.Projectile; -import msc.gs.model.mini.Damager; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.PathGenerator; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Projectile; +import org.moparscape.msc.gs.model.mini.Damager; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; + public class RangeEvent extends DelayedEvent { private Mob affectedMob; diff --git a/GameServer/src/msc/gs/event/ShortEvent.java b/GameServer/src/org/moparscape/msc/gs/event/ShortEvent.java similarity index 63% rename from GameServer/src/msc/gs/event/ShortEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/ShortEvent.java index 8239ae7..5d75511 100644 --- a/GameServer/src/msc/gs/event/ShortEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/ShortEvent.java @@ -1,6 +1,6 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Player; public abstract class ShortEvent extends SingleEvent { diff --git a/GameServer/src/msc/gs/event/SingleEvent.java b/GameServer/src/org/moparscape/msc/gs/event/SingleEvent.java similarity index 77% rename from GameServer/src/msc/gs/event/SingleEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/SingleEvent.java index 0969fb9..70edc31 100644 --- a/GameServer/src/msc/gs/event/SingleEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/SingleEvent.java @@ -1,6 +1,6 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Player; public abstract class SingleEvent extends DelayedEvent { diff --git a/GameServer/src/msc/gs/event/WalkMobToMobEvent.java b/GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java similarity index 90% rename from GameServer/src/msc/gs/event/WalkMobToMobEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java index a420c8f..3b745dd 100644 --- a/GameServer/src/msc/gs/event/WalkMobToMobEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/WalkMobToMobEvent.java @@ -1,9 +1,9 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.external.NPCLoc; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Path; +import org.moparscape.msc.gs.external.NPCLoc; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Path; public abstract class WalkMobToMobEvent extends DelayedEvent { protected Mob affectedMob; diff --git a/GameServer/src/msc/gs/event/WalkToMobEvent.java b/GameServer/src/org/moparscape/msc/gs/event/WalkToMobEvent.java similarity index 82% rename from GameServer/src/msc/gs/event/WalkToMobEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/WalkToMobEvent.java index c5372b6..574bc33 100644 --- a/GameServer/src/msc/gs/event/WalkToMobEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/WalkToMobEvent.java @@ -1,7 +1,7 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.model.Mob; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Player; public abstract class WalkToMobEvent extends DelayedEvent { protected Mob affectedMob; diff --git a/GameServer/src/msc/gs/event/WalkToObjectEvent.java b/GameServer/src/org/moparscape/msc/gs/event/WalkToObjectEvent.java similarity index 81% rename from GameServer/src/msc/gs/event/WalkToObjectEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/WalkToObjectEvent.java index 2a2c5d0..9681f13 100644 --- a/GameServer/src/msc/gs/event/WalkToObjectEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/WalkToObjectEvent.java @@ -1,7 +1,7 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.model.GameObject; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Player; public abstract class WalkToObjectEvent extends DelayedEvent { protected GameObject object; diff --git a/GameServer/src/msc/gs/event/WalkToPointEvent.java b/GameServer/src/org/moparscape/msc/gs/event/WalkToPointEvent.java similarity index 83% rename from GameServer/src/msc/gs/event/WalkToPointEvent.java rename to GameServer/src/org/moparscape/msc/gs/event/WalkToPointEvent.java index e931708..47b3958 100644 --- a/GameServer/src/msc/gs/event/WalkToPointEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/event/WalkToPointEvent.java @@ -1,7 +1,7 @@ -package msc.gs.event; +package org.moparscape.msc.gs.event; -import msc.gs.model.Player; -import msc.gs.model.Point; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; public abstract class WalkToPointEvent extends DelayedEvent { protected Point location; diff --git a/GameServer/src/msc/gs/external/AgilityCourseDef.java b/GameServer/src/org/moparscape/msc/gs/external/AgilityCourseDef.java similarity index 90% rename from GameServer/src/msc/gs/external/AgilityCourseDef.java rename to GameServer/src/org/moparscape/msc/gs/external/AgilityCourseDef.java index d6b36e4..975941c 100644 --- a/GameServer/src/msc/gs/external/AgilityCourseDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/AgilityCourseDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * Defines an agility course diff --git a/GameServer/src/msc/gs/external/AgilityDef.java b/GameServer/src/org/moparscape/msc/gs/external/AgilityDef.java similarity index 92% rename from GameServer/src/msc/gs/external/AgilityDef.java rename to GameServer/src/org/moparscape/msc/gs/external/AgilityDef.java index e447207..660a52a 100644 --- a/GameServer/src/msc/gs/external/AgilityDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/AgilityDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * Defines an agility course object diff --git a/GameServer/src/msc/gs/external/CertDef.java b/GameServer/src/org/moparscape/msc/gs/external/CertDef.java similarity index 86% rename from GameServer/src/msc/gs/external/CertDef.java rename to GameServer/src/org/moparscape/msc/gs/external/CertDef.java index 3d2740a..9f7f1b7 100644 --- a/GameServer/src/msc/gs/external/CertDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/CertDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class CertDef { /** diff --git a/GameServer/src/msc/gs/external/CerterDef.java b/GameServer/src/org/moparscape/msc/gs/external/CerterDef.java similarity index 89% rename from GameServer/src/msc/gs/external/CerterDef.java rename to GameServer/src/org/moparscape/msc/gs/external/CerterDef.java index c1c938d..0dc3d32 100644 --- a/GameServer/src/msc/gs/external/CerterDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/CerterDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class CerterDef { /** diff --git a/GameServer/src/msc/gs/external/DoorDef.java b/GameServer/src/org/moparscape/msc/gs/external/DoorDef.java similarity index 95% rename from GameServer/src/msc/gs/external/DoorDef.java rename to GameServer/src/org/moparscape/msc/gs/external/DoorDef.java index cffc257..33187a5 100644 --- a/GameServer/src/msc/gs/external/DoorDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/DoorDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for doors diff --git a/GameServer/src/msc/gs/external/EntityDef.java b/GameServer/src/org/moparscape/msc/gs/external/EntityDef.java similarity index 93% rename from GameServer/src/msc/gs/external/EntityDef.java rename to GameServer/src/org/moparscape/msc/gs/external/EntityDef.java index 1bf705a..36f2405 100644 --- a/GameServer/src/msc/gs/external/EntityDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/EntityDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The abstract class EntityDef implements methods for return values which are diff --git a/GameServer/src/msc/gs/external/EntityHandler.java b/GameServer/src/org/moparscape/msc/gs/external/EntityHandler.java similarity index 98% rename from GameServer/src/msc/gs/external/EntityHandler.java rename to GameServer/src/org/moparscape/msc/gs/external/EntityHandler.java index 5590985..a4cd461 100644 --- a/GameServer/src/msc/gs/external/EntityHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/external/EntityHandler.java @@ -1,11 +1,12 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; import java.util.HashMap; import java.util.List; -import msc.gs.model.Point; -import msc.gs.model.TelePoint; -import msc.gs.util.PersistenceManager; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.TelePoint; +import org.moparscape.msc.gs.util.PersistenceManager; + /** * This class handles the loading of entities from the conf files, and provides diff --git a/GameServer/src/msc/gs/external/FiremakingDef.java b/GameServer/src/org/moparscape/msc/gs/external/FiremakingDef.java similarity index 86% rename from GameServer/src/msc/gs/external/FiremakingDef.java rename to GameServer/src/org/moparscape/msc/gs/external/FiremakingDef.java index 4952fe4..6a6b5bb 100644 --- a/GameServer/src/msc/gs/external/FiremakingDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/FiremakingDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class FiremakingDef { /** diff --git a/GameServer/src/msc/gs/external/GameObjectDef.java b/GameServer/src/org/moparscape/msc/gs/external/GameObjectDef.java similarity index 96% rename from GameServer/src/msc/gs/external/GameObjectDef.java rename to GameServer/src/org/moparscape/msc/gs/external/GameObjectDef.java index cc49e6c..6cb8ec0 100644 --- a/GameServer/src/msc/gs/external/GameObjectDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/GameObjectDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for game objects diff --git a/GameServer/src/msc/gs/external/GameObjectLoc.java b/GameServer/src/org/moparscape/msc/gs/external/GameObjectLoc.java similarity index 89% rename from GameServer/src/msc/gs/external/GameObjectLoc.java rename to GameServer/src/org/moparscape/msc/gs/external/GameObjectLoc.java index e99ef65..9e7caca 100644 --- a/GameServer/src/msc/gs/external/GameObjectLoc.java +++ b/GameServer/src/org/moparscape/msc/gs/external/GameObjectLoc.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class GameObjectLoc { /** diff --git a/GameServer/src/msc/gs/external/ItemArrowHeadDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemArrowHeadDef.java similarity index 87% rename from GameServer/src/msc/gs/external/ItemArrowHeadDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemArrowHeadDef.java index 27d4bf4..35ae8f8 100644 --- a/GameServer/src/msc/gs/external/ItemArrowHeadDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemArrowHeadDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemBowStringDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemBowStringDef.java similarity index 87% rename from GameServer/src/msc/gs/external/ItemBowStringDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemBowStringDef.java index 6dfcd13..fe28fcb 100644 --- a/GameServer/src/msc/gs/external/ItemBowStringDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemBowStringDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemCookingDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemCookingDef.java similarity index 88% rename from GameServer/src/msc/gs/external/ItemCookingDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemCookingDef.java index f57e506..53657a1 100644 --- a/GameServer/src/msc/gs/external/ItemCookingDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemCookingDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemCraftingDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemCraftingDef.java similarity index 86% rename from GameServer/src/msc/gs/external/ItemCraftingDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemCraftingDef.java index 39cba19..a9d747d 100644 --- a/GameServer/src/msc/gs/external/ItemCraftingDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemCraftingDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class ItemCraftingDef { /** diff --git a/GameServer/src/msc/gs/external/ItemDartTipDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemDartTipDef.java similarity index 87% rename from GameServer/src/msc/gs/external/ItemDartTipDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemDartTipDef.java index 0094e1d..4f5af9c 100644 --- a/GameServer/src/msc/gs/external/ItemDartTipDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemDartTipDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemDef.java similarity index 96% rename from GameServer/src/msc/gs/external/ItemDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemDef.java index 5d8a62c..0f23311 100644 --- a/GameServer/src/msc/gs/external/ItemDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemDropDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemDropDef.java similarity index 85% rename from GameServer/src/msc/gs/external/ItemDropDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemDropDef.java index a59c195..7e6c151 100644 --- a/GameServer/src/msc/gs/external/ItemDropDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemDropDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class ItemDropDef { public int amount; diff --git a/GameServer/src/msc/gs/external/ItemGemDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemGemDef.java similarity index 86% rename from GameServer/src/msc/gs/external/ItemGemDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemGemDef.java index 234da0e..94344b4 100644 --- a/GameServer/src/msc/gs/external/ItemGemDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemGemDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemHerbDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemHerbDef.java similarity index 86% rename from GameServer/src/msc/gs/external/ItemHerbDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemHerbDef.java index 38573a6..db3c345 100644 --- a/GameServer/src/msc/gs/external/ItemHerbDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemHerbDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemHerbSecond.java b/GameServer/src/org/moparscape/msc/gs/external/ItemHerbSecond.java similarity index 89% rename from GameServer/src/msc/gs/external/ItemHerbSecond.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemHerbSecond.java index 46bd4fe..a2e2417 100644 --- a/GameServer/src/msc/gs/external/ItemHerbSecond.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemHerbSecond.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemLoc.java b/GameServer/src/org/moparscape/msc/gs/external/ItemLoc.java similarity index 87% rename from GameServer/src/msc/gs/external/ItemLoc.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemLoc.java index f3f4390..8b8e9e7 100644 --- a/GameServer/src/msc/gs/external/ItemLoc.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemLoc.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class ItemLoc { /** diff --git a/GameServer/src/msc/gs/external/ItemLogCutDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemLogCutDef.java similarity index 89% rename from GameServer/src/msc/gs/external/ItemLogCutDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemLogCutDef.java index 962d367..30522d0 100644 --- a/GameServer/src/msc/gs/external/ItemLogCutDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemLogCutDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemSmeltingDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemSmeltingDef.java similarity index 88% rename from GameServer/src/msc/gs/external/ItemSmeltingDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemSmeltingDef.java index a871e77..da791a7 100644 --- a/GameServer/src/msc/gs/external/ItemSmeltingDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemSmeltingDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for items diff --git a/GameServer/src/msc/gs/external/ItemSmithingDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemSmithingDef.java similarity index 88% rename from GameServer/src/msc/gs/external/ItemSmithingDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemSmithingDef.java index 4abdd7c..1077834 100644 --- a/GameServer/src/msc/gs/external/ItemSmithingDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemSmithingDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class ItemSmithingDef { /** diff --git a/GameServer/src/msc/gs/external/ItemUnIdentHerbDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemUnIdentHerbDef.java similarity index 87% rename from GameServer/src/msc/gs/external/ItemUnIdentHerbDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemUnIdentHerbDef.java index 9881481..473f938 100644 --- a/GameServer/src/msc/gs/external/ItemUnIdentHerbDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemUnIdentHerbDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for herbs diff --git a/GameServer/src/msc/gs/external/ItemWieldableDef.java b/GameServer/src/org/moparscape/msc/gs/external/ItemWieldableDef.java similarity index 93% rename from GameServer/src/msc/gs/external/ItemWieldableDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ItemWieldableDef.java index d062e64..ac475fc 100644 --- a/GameServer/src/msc/gs/external/ItemWieldableDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ItemWieldableDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; import java.util.HashMap; import java.util.Set; diff --git a/GameServer/src/msc/gs/external/NPCDef.java b/GameServer/src/org/moparscape/msc/gs/external/NPCDef.java similarity index 98% rename from GameServer/src/msc/gs/external/NPCDef.java rename to GameServer/src/org/moparscape/msc/gs/external/NPCDef.java index 9c3550f..6a560e8 100644 --- a/GameServer/src/msc/gs/external/NPCDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/NPCDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for npcs diff --git a/GameServer/src/msc/gs/external/NPCLoc.java b/GameServer/src/org/moparscape/msc/gs/external/NPCLoc.java similarity index 90% rename from GameServer/src/msc/gs/external/NPCLoc.java rename to GameServer/src/org/moparscape/msc/gs/external/NPCLoc.java index 5b2160c..3708e49 100644 --- a/GameServer/src/msc/gs/external/NPCLoc.java +++ b/GameServer/src/org/moparscape/msc/gs/external/NPCLoc.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class NPCLoc { /** diff --git a/GameServer/src/msc/gs/external/ObjectFishDef.java b/GameServer/src/org/moparscape/msc/gs/external/ObjectFishDef.java similarity index 86% rename from GameServer/src/msc/gs/external/ObjectFishDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ObjectFishDef.java index 834c5eb..73715a6 100644 --- a/GameServer/src/msc/gs/external/ObjectFishDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ObjectFishDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for fish diff --git a/GameServer/src/msc/gs/external/ObjectFishingDef.java b/GameServer/src/org/moparscape/msc/gs/external/ObjectFishingDef.java similarity index 89% rename from GameServer/src/msc/gs/external/ObjectFishingDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ObjectFishingDef.java index 07b59e9..13ae6b2 100644 --- a/GameServer/src/msc/gs/external/ObjectFishingDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ObjectFishingDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for fishing spots diff --git a/GameServer/src/msc/gs/external/ObjectMiningDef.java b/GameServer/src/org/moparscape/msc/gs/external/ObjectMiningDef.java similarity index 88% rename from GameServer/src/msc/gs/external/ObjectMiningDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ObjectMiningDef.java index a609611..efeed92 100644 --- a/GameServer/src/msc/gs/external/ObjectMiningDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ObjectMiningDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for rocks diff --git a/GameServer/src/msc/gs/external/ObjectWoodcuttingDef.java b/GameServer/src/org/moparscape/msc/gs/external/ObjectWoodcuttingDef.java similarity index 89% rename from GameServer/src/msc/gs/external/ObjectWoodcuttingDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ObjectWoodcuttingDef.java index 63e7e6d..ac5083c 100644 --- a/GameServer/src/msc/gs/external/ObjectWoodcuttingDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ObjectWoodcuttingDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for trees diff --git a/GameServer/src/msc/gs/external/PrayerDef.java b/GameServer/src/org/moparscape/msc/gs/external/PrayerDef.java similarity index 90% rename from GameServer/src/msc/gs/external/PrayerDef.java rename to GameServer/src/org/moparscape/msc/gs/external/PrayerDef.java index fd0e398..c1ab723 100644 --- a/GameServer/src/msc/gs/external/PrayerDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/PrayerDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for prayers diff --git a/GameServer/src/msc/gs/external/ReqOreDef.java b/GameServer/src/org/moparscape/msc/gs/external/ReqOreDef.java similarity index 82% rename from GameServer/src/msc/gs/external/ReqOreDef.java rename to GameServer/src/org/moparscape/msc/gs/external/ReqOreDef.java index d461c26..7e8e93f 100644 --- a/GameServer/src/msc/gs/external/ReqOreDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/ReqOreDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; /** * The definition wrapper for ores diff --git a/GameServer/src/msc/gs/external/SpellDef.java b/GameServer/src/org/moparscape/msc/gs/external/SpellDef.java similarity index 95% rename from GameServer/src/msc/gs/external/SpellDef.java rename to GameServer/src/org/moparscape/msc/gs/external/SpellDef.java index fc5dfdd..3c275e8 100644 --- a/GameServer/src/msc/gs/external/SpellDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/SpellDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; import java.util.HashMap; import java.util.Set; diff --git a/GameServer/src/msc/gs/external/TileDef.java b/GameServer/src/org/moparscape/msc/gs/external/TileDef.java similarity index 82% rename from GameServer/src/msc/gs/external/TileDef.java rename to GameServer/src/org/moparscape/msc/gs/external/TileDef.java index d8ab21a..3dd53cd 100644 --- a/GameServer/src/msc/gs/external/TileDef.java +++ b/GameServer/src/org/moparscape/msc/gs/external/TileDef.java @@ -1,4 +1,4 @@ -package msc.gs.external; +package org.moparscape.msc.gs.external; public class TileDef { public int colour; diff --git a/GameServer/src/msc/gs/io/WorldLoader.java b/GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java similarity index 85% rename from GameServer/src/msc/gs/io/WorldLoader.java rename to GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java index 7877c92..d331fdd 100644 --- a/GameServer/src/msc/gs/io/WorldLoader.java +++ b/GameServer/src/org/moparscape/msc/gs/io/WorldLoader.java @@ -1,4 +1,4 @@ -package msc.gs.io; +package org.moparscape.msc.gs.io; import java.io.BufferedInputStream; import java.io.File; @@ -7,23 +7,24 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import msc.config.Config; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.external.EntityHandler; -import msc.gs.external.GameObjectLoc; -import msc.gs.external.ItemLoc; -import msc.gs.external.NPCLoc; -import msc.gs.model.GameObject; -import msc.gs.model.Item; -import msc.gs.model.Npc; -import msc.gs.model.Sector; -import msc.gs.model.Shop; -import msc.gs.model.World; -import msc.gs.tools.DataConversions; -import msc.gs.util.Logger; -import msc.gs.util.PersistenceManager; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.GameObjectLoc; +import org.moparscape.msc.gs.external.ItemLoc; +import org.moparscape.msc.gs.external.NPCLoc; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Sector; +import org.moparscape.msc.gs.model.Shop; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.Logger; +import org.moparscape.msc.gs.util.PersistenceManager; + public class WorldLoader { private ZipFile tileArchive; diff --git a/GameServer/src/msc/gs/model/ActiveTile.java b/GameServer/src/org/moparscape/msc/gs/model/ActiveTile.java similarity index 91% rename from GameServer/src/msc/gs/model/ActiveTile.java rename to GameServer/src/org/moparscape/msc/gs/model/ActiveTile.java index 0cd6379..098dfc7 100644 --- a/GameServer/src/msc/gs/model/ActiveTile.java +++ b/GameServer/src/org/moparscape/msc/gs/model/ActiveTile.java @@ -1,11 +1,12 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.util.LinkedList; import java.util.List; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.tools.DataConversions; + public class ActiveTile { diff --git a/GameServer/src/msc/gs/model/Bank.java b/GameServer/src/org/moparscape/msc/gs/model/Bank.java similarity index 93% rename from GameServer/src/msc/gs/model/Bank.java rename to GameServer/src/org/moparscape/msc/gs/model/Bank.java index a88006c..bafe245 100644 --- a/GameServer/src/msc/gs/model/Bank.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Bank.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.util.ArrayList; import java.util.Iterator; diff --git a/GameServer/src/msc/gs/model/Bubble.java b/GameServer/src/org/moparscape/msc/gs/model/Bubble.java similarity index 85% rename from GameServer/src/msc/gs/model/Bubble.java rename to GameServer/src/org/moparscape/msc/gs/model/Bubble.java index 6db770b..e971bd4 100644 --- a/GameServer/src/msc/gs/model/Bubble.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Bubble.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; public class Bubble { /** diff --git a/GameServer/src/msc/gs/model/ChatMessage.java b/GameServer/src/org/moparscape/msc/gs/model/ChatMessage.java similarity index 85% rename from GameServer/src/msc/gs/model/ChatMessage.java rename to GameServer/src/org/moparscape/msc/gs/model/ChatMessage.java index acf9a92..7fc8759 100644 --- a/GameServer/src/msc/gs/model/ChatMessage.java +++ b/GameServer/src/org/moparscape/msc/gs/model/ChatMessage.java @@ -1,6 +1,6 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.tools.DataConversions; public class ChatMessage { /** diff --git a/GameServer/src/msc/gs/model/Entity.java b/GameServer/src/org/moparscape/msc/gs/model/Entity.java similarity index 93% rename from GameServer/src/msc/gs/model/Entity.java rename to GameServer/src/org/moparscape/msc/gs/model/Entity.java index 40bfec3..a74c145 100644 --- a/GameServer/src/msc/gs/model/Entity.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Entity.java @@ -1,8 +1,8 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; public class Entity { /** diff --git a/GameServer/src/msc/gs/model/GameObject.java b/GameServer/src/org/moparscape/msc/gs/model/GameObject.java similarity index 88% rename from GameServer/src/msc/gs/model/GameObject.java rename to GameServer/src/org/moparscape/msc/gs/model/GameObject.java index c82c8f5..638f398 100644 --- a/GameServer/src/msc/gs/model/GameObject.java +++ b/GameServer/src/org/moparscape/msc/gs/model/GameObject.java @@ -1,9 +1,9 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.gs.external.DoorDef; -import msc.gs.external.EntityHandler; -import msc.gs.external.GameObjectDef; -import msc.gs.external.GameObjectLoc; +import org.moparscape.msc.gs.external.DoorDef; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.GameObjectDef; +import org.moparscape.msc.gs.external.GameObjectLoc; public class GameObject extends Entity { /** diff --git a/GameServer/src/msc/gs/model/InvItem.java b/GameServer/src/org/moparscape/msc/gs/model/InvItem.java similarity index 81% rename from GameServer/src/msc/gs/model/InvItem.java rename to GameServer/src/org/moparscape/msc/gs/model/InvItem.java index 19c38ad..e69762b 100644 --- a/GameServer/src/msc/gs/model/InvItem.java +++ b/GameServer/src/org/moparscape/msc/gs/model/InvItem.java @@ -1,11 +1,11 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.gs.external.EntityHandler; -import msc.gs.external.ItemCookingDef; -import msc.gs.external.ItemDef; -import msc.gs.external.ItemSmeltingDef; -import msc.gs.external.ItemUnIdentHerbDef; -import msc.gs.external.ItemWieldableDef; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.ItemCookingDef; +import org.moparscape.msc.gs.external.ItemDef; +import org.moparscape.msc.gs.external.ItemSmeltingDef; +import org.moparscape.msc.gs.external.ItemUnIdentHerbDef; +import org.moparscape.msc.gs.external.ItemWieldableDef; public class InvItem extends Entity implements Comparable { diff --git a/GameServer/src/msc/gs/model/Inventory.java b/GameServer/src/org/moparscape/msc/gs/model/Inventory.java similarity index 94% rename from GameServer/src/msc/gs/model/Inventory.java rename to GameServer/src/org/moparscape/msc/gs/model/Inventory.java index 4125e0d..758f18c 100644 --- a/GameServer/src/msc/gs/model/Inventory.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Inventory.java @@ -1,11 +1,12 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.ListIterator; -import msc.gs.Instance; +import org.moparscape.msc.gs.Instance; + public class Inventory { /** diff --git a/GameServer/src/msc/gs/model/Item.java b/GameServer/src/org/moparscape/msc/gs/model/Item.java similarity index 89% rename from GameServer/src/msc/gs/model/Item.java rename to GameServer/src/org/moparscape/msc/gs/model/Item.java index b1ecf46..140cfb0 100644 --- a/GameServer/src/msc/gs/model/Item.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Item.java @@ -1,11 +1,11 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.gs.Instance; -import msc.gs.db.DBConnection; -import msc.gs.event.DelayedEvent; -import msc.gs.external.EntityHandler; -import msc.gs.external.ItemDef; -import msc.gs.external.ItemLoc; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.db.DBConnection; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.ItemDef; +import org.moparscape.msc.gs.external.ItemLoc; public class Item extends Entity { /** diff --git a/GameServer/src/msc/gs/model/MenuHandler.java b/GameServer/src/org/moparscape/msc/gs/model/MenuHandler.java similarity index 91% rename from GameServer/src/msc/gs/model/MenuHandler.java rename to GameServer/src/org/moparscape/msc/gs/model/MenuHandler.java index 624514c..cdab3f0 100644 --- a/GameServer/src/msc/gs/model/MenuHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/model/MenuHandler.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; public abstract class MenuHandler { /** diff --git a/GameServer/src/msc/gs/model/Mob.java b/GameServer/src/org/moparscape/msc/gs/model/Mob.java similarity index 91% rename from GameServer/src/msc/gs/model/Mob.java rename to GameServer/src/org/moparscape/msc/gs/model/Mob.java index 71cf145..2e42aa2 100644 --- a/GameServer/src/msc/gs/model/Mob.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Mob.java @@ -1,12 +1,12 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.gs.Instance; -import msc.gs.event.DelayedEvent; -import msc.gs.event.DuelEvent; -import msc.gs.event.FightEvent; -import msc.gs.states.Action; -import msc.gs.states.CombatState; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.DuelEvent; +import org.moparscape.msc.gs.event.FightEvent; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.states.CombatState; +import org.moparscape.msc.gs.util.Logger; public abstract class Mob extends Entity { diff --git a/GameServer/src/msc/gs/model/Npc.java b/GameServer/src/org/moparscape/msc/gs/model/Npc.java similarity index 90% rename from GameServer/src/msc/gs/model/Npc.java rename to GameServer/src/org/moparscape/msc/gs/model/Npc.java index 34fceca..72a279e 100644 --- a/GameServer/src/msc/gs/model/Npc.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Npc.java @@ -1,21 +1,22 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.util.ArrayList; import java.util.ConcurrentModificationException; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.event.DelayedEvent; -import msc.gs.event.FightEvent; -import msc.gs.external.EntityHandler; -import msc.gs.external.ItemDropDef; -import msc.gs.external.NPCDef; -import msc.gs.external.NPCLoc; -import msc.gs.plugins.dependencies.NpcAI; -import msc.gs.states.Action; -import msc.gs.states.CombatState; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.FightEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.ItemDropDef; +import org.moparscape.msc.gs.external.NPCDef; +import org.moparscape.msc.gs.external.NPCLoc; +import org.moparscape.msc.gs.plugins.dependencies.NpcAI; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.states.CombatState; +import org.moparscape.msc.gs.tools.DataConversions; + public class Npc extends Mob { diff --git a/GameServer/src/msc/gs/model/Path.java b/GameServer/src/org/moparscape/msc/gs/model/Path.java similarity index 93% rename from GameServer/src/msc/gs/model/Path.java rename to GameServer/src/org/moparscape/msc/gs/model/Path.java index acfa23d..37b09b3 100644 --- a/GameServer/src/msc/gs/model/Path.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Path.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; public class Path { /** diff --git a/GameServer/src/msc/gs/model/PathGenerator.java b/GameServer/src/org/moparscape/msc/gs/model/PathGenerator.java similarity index 94% rename from GameServer/src/msc/gs/model/PathGenerator.java rename to GameServer/src/org/moparscape/msc/gs/model/PathGenerator.java index 055e80f..c6add1d 100644 --- a/GameServer/src/msc/gs/model/PathGenerator.java +++ b/GameServer/src/org/moparscape/msc/gs/model/PathGenerator.java @@ -1,6 +1,6 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.gs.Instance; +import org.moparscape.msc.gs.Instance; /** * diff --git a/GameServer/src/msc/gs/model/PathHandler.java b/GameServer/src/org/moparscape/msc/gs/model/PathHandler.java similarity index 95% rename from GameServer/src/msc/gs/model/PathHandler.java rename to GameServer/src/org/moparscape/msc/gs/model/PathHandler.java index df6ef04..e026e7e 100644 --- a/GameServer/src/msc/gs/model/PathHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/model/PathHandler.java @@ -1,6 +1,6 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.gs.Instance; +import org.moparscape.msc.gs.Instance; public class PathHandler { /** diff --git a/GameServer/src/msc/gs/model/Player.java b/GameServer/src/org/moparscape/msc/gs/model/Player.java similarity index 98% rename from GameServer/src/msc/gs/model/Player.java rename to GameServer/src/org/moparscape/msc/gs/model/Player.java index 1917426..d157c75 100644 --- a/GameServer/src/msc/gs/model/Player.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Player.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.io.PrintWriter; import java.io.StringWriter; @@ -14,31 +14,31 @@ import java.util.TreeMap; import java.util.Map.Entry; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.MiscPacketBuilder; +import org.moparscape.msc.gs.builders.ls.SavePacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.db.DBConnection; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.event.RangeEvent; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.external.AgilityCourseDef; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.PrayerDef; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.client.WieldHandler; +import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.states.CombatState; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.DuelLog; +import org.moparscape.msc.gs.util.Logger; +import org.moparscape.msc.gs.util.StatefulEntityCollection; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.builders.MiscPacketBuilder; -import msc.gs.builders.ls.SavePacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.connection.RSCPacket; -import msc.gs.db.DBConnection; -import msc.gs.event.DelayedEvent; -import msc.gs.event.MiniEvent; -import msc.gs.event.RangeEvent; -import msc.gs.event.ShortEvent; -import msc.gs.external.AgilityCourseDef; -import msc.gs.external.EntityHandler; -import msc.gs.external.PrayerDef; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.client.WieldHandler; -import msc.gs.quest.Quest; -import msc.gs.states.Action; -import msc.gs.states.CombatState; -import msc.gs.tools.DataConversions; -import msc.gs.util.DuelLog; -import msc.gs.util.Logger; -import msc.gs.util.StatefulEntityCollection; import bsh.Interpreter; /** diff --git a/GameServer/src/msc/gs/model/PlayerAppearance.java b/GameServer/src/org/moparscape/msc/gs/model/PlayerAppearance.java similarity index 87% rename from GameServer/src/msc/gs/model/PlayerAppearance.java rename to GameServer/src/org/moparscape/msc/gs/model/PlayerAppearance.java index 3a8ce79..ae54de0 100644 --- a/GameServer/src/msc/gs/model/PlayerAppearance.java +++ b/GameServer/src/org/moparscape/msc/gs/model/PlayerAppearance.java @@ -1,7 +1,7 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.config.Formulae; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.tools.DataConversions; public class PlayerAppearance { diff --git a/GameServer/src/msc/gs/model/Point.java b/GameServer/src/org/moparscape/msc/gs/model/Point.java similarity index 89% rename from GameServer/src/msc/gs/model/Point.java rename to GameServer/src/org/moparscape/msc/gs/model/Point.java index 8387596..b481b8e 100644 --- a/GameServer/src/msc/gs/model/Point.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Point.java @@ -1,7 +1,7 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; -import msc.config.Formulae; -import msc.gs.Instance; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; public class Point { public static Point location(int x, int y) { diff --git a/GameServer/src/msc/gs/model/Projectile.java b/GameServer/src/org/moparscape/msc/gs/model/Projectile.java similarity index 88% rename from GameServer/src/msc/gs/model/Projectile.java rename to GameServer/src/org/moparscape/msc/gs/model/Projectile.java index 5b2ffec..016b2fc 100644 --- a/GameServer/src/msc/gs/model/Projectile.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Projectile.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; public class Projectile { /** diff --git a/GameServer/src/msc/gs/model/Script.java b/GameServer/src/org/moparscape/msc/gs/model/Script.java similarity index 94% rename from GameServer/src/msc/gs/model/Script.java rename to GameServer/src/org/moparscape/msc/gs/model/Script.java index 5de057e..97d647c 100644 --- a/GameServer/src/msc/gs/model/Script.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Script.java @@ -1,11 +1,12 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.io.FileNotFoundException; import java.io.IOException; import java.util.ConcurrentModificationException; -import msc.gs.external.EntityHandler; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.util.Logger; + import bsh.EvalError; public class Script { diff --git a/GameServer/src/msc/gs/model/Sector.java b/GameServer/src/org/moparscape/msc/gs/model/Sector.java similarity index 93% rename from GameServer/src/msc/gs/model/Sector.java rename to GameServer/src/org/moparscape/msc/gs/model/Sector.java index dc377ef..672b120 100644 --- a/GameServer/src/msc/gs/model/Sector.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Sector.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/GameServer/src/msc/gs/model/Shop.java b/GameServer/src/org/moparscape/msc/gs/model/Shop.java similarity index 92% rename from GameServer/src/msc/gs/model/Shop.java rename to GameServer/src/org/moparscape/msc/gs/model/Shop.java index 22578b3..943dcca 100644 --- a/GameServer/src/msc/gs/model/Shop.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Shop.java @@ -1,13 +1,14 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import msc.gs.Instance; -import msc.gs.event.DelayedEvent; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.tools.DataConversions; + public class Shop { /** diff --git a/GameServer/src/msc/gs/model/Syndicate.java b/GameServer/src/org/moparscape/msc/gs/model/Syndicate.java similarity index 87% rename from GameServer/src/msc/gs/model/Syndicate.java rename to GameServer/src/org/moparscape/msc/gs/model/Syndicate.java index b8099cf..9ebcaa6 100644 --- a/GameServer/src/msc/gs/model/Syndicate.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Syndicate.java @@ -1,8 +1,9 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.util.ArrayList; -import msc.gs.model.mini.Damager; +import org.moparscape.msc.gs.model.mini.Damager; + /** * Each NPC has a Damage Syndicate (pool of damage) binded to them. diff --git a/GameServer/src/msc/gs/model/TelePoint.java b/GameServer/src/org/moparscape/msc/gs/model/TelePoint.java similarity index 73% rename from GameServer/src/msc/gs/model/TelePoint.java rename to GameServer/src/org/moparscape/msc/gs/model/TelePoint.java index f00cf33..377ff15 100644 --- a/GameServer/src/msc/gs/model/TelePoint.java +++ b/GameServer/src/org/moparscape/msc/gs/model/TelePoint.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; public class TelePoint extends Point { public String command; diff --git a/GameServer/src/msc/gs/model/Tile.java b/GameServer/src/org/moparscape/msc/gs/model/Tile.java similarity index 93% rename from GameServer/src/msc/gs/model/Tile.java rename to GameServer/src/org/moparscape/msc/gs/model/Tile.java index 63af876..46f72d6 100644 --- a/GameServer/src/msc/gs/model/Tile.java +++ b/GameServer/src/org/moparscape/msc/gs/model/Tile.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/GameServer/src/msc/gs/model/TileValue.java b/GameServer/src/org/moparscape/msc/gs/model/TileValue.java similarity index 84% rename from GameServer/src/msc/gs/model/TileValue.java rename to GameServer/src/org/moparscape/msc/gs/model/TileValue.java index 5951451..61d4d47 100644 --- a/GameServer/src/msc/gs/model/TileValue.java +++ b/GameServer/src/org/moparscape/msc/gs/model/TileValue.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; public class TileValue { public int diagWallVal = 0; diff --git a/GameServer/src/msc/gs/model/ViewArea.java b/GameServer/src/org/moparscape/msc/gs/model/ViewArea.java similarity index 93% rename from GameServer/src/msc/gs/model/ViewArea.java rename to GameServer/src/org/moparscape/msc/gs/model/ViewArea.java index b25ca87..4a57846 100644 --- a/GameServer/src/msc/gs/model/ViewArea.java +++ b/GameServer/src/org/moparscape/msc/gs/model/ViewArea.java @@ -1,9 +1,10 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.util.ArrayList; import java.util.List; -import msc.gs.Instance; +import org.moparscape.msc.gs.Instance; + public class ViewArea { private static World world = Instance.getWorld(); diff --git a/GameServer/src/msc/gs/model/World.java b/GameServer/src/org/moparscape/msc/gs/model/World.java similarity index 95% rename from GameServer/src/msc/gs/model/World.java rename to GameServer/src/org/moparscape/msc/gs/model/World.java index af624fa..ae3d93f 100644 --- a/GameServer/src/msc/gs/model/World.java +++ b/GameServer/src/org/moparscape/msc/gs/model/World.java @@ -1,4 +1,4 @@ -package msc.gs.model; +package org.moparscape.msc.gs.model; import java.io.File; import java.util.ArrayList; @@ -8,24 +8,25 @@ import java.util.LinkedList; import java.util.List; import java.util.TreeMap; -import msc.config.Constants; -import msc.gs.Server; -import msc.gs.core.ClientUpdater; -import msc.gs.core.DelayedEventHandler; -import msc.gs.db.DBConnection; -import msc.gs.event.DelayedEvent; -import msc.gs.event.SingleEvent; -import msc.gs.external.GameObjectLoc; -import msc.gs.external.NPCLoc; -import msc.gs.io.WorldLoader; -import msc.gs.model.snapshot.Snapshot; -import msc.gs.npchandler.NpcHandler; -import msc.gs.npchandler.NpcHandlerDef; -import msc.gs.quest.QuestManager; -import msc.gs.states.CombatState; -import msc.gs.util.EntityList; -import msc.gs.util.Logger; -import msc.gs.util.PersistenceManager; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.gs.Server; +import org.moparscape.msc.gs.core.ClientUpdater; +import org.moparscape.msc.gs.core.DelayedEventHandler; +import org.moparscape.msc.gs.db.DBConnection; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.external.GameObjectLoc; +import org.moparscape.msc.gs.external.NPCLoc; +import org.moparscape.msc.gs.io.WorldLoader; +import org.moparscape.msc.gs.model.snapshot.Snapshot; +import org.moparscape.msc.gs.npchandler.NpcHandler; +import org.moparscape.msc.gs.npchandler.NpcHandlerDef; +import org.moparscape.msc.gs.quest.QuestManager; +import org.moparscape.msc.gs.states.CombatState; +import org.moparscape.msc.gs.util.EntityList; +import org.moparscape.msc.gs.util.Logger; +import org.moparscape.msc.gs.util.PersistenceManager; + public final class World { diff --git a/GameServer/src/msc/gs/model/mini/Cache.java b/GameServer/src/org/moparscape/msc/gs/model/mini/Cache.java similarity index 77% rename from GameServer/src/msc/gs/model/mini/Cache.java rename to GameServer/src/org/moparscape/msc/gs/model/mini/Cache.java index b85233f..cae60b2 100644 --- a/GameServer/src/msc/gs/model/mini/Cache.java +++ b/GameServer/src/org/moparscape/msc/gs/model/mini/Cache.java @@ -1,4 +1,4 @@ -package msc.gs.model.mini; +package org.moparscape.msc.gs.model.mini; /** * Data each player gets cached. diff --git a/GameServer/src/msc/gs/model/mini/Damager.java b/GameServer/src/org/moparscape/msc/gs/model/mini/Damager.java similarity index 88% rename from GameServer/src/msc/gs/model/mini/Damager.java rename to GameServer/src/org/moparscape/msc/gs/model/mini/Damager.java index 31d3ea2..97f4606 100644 --- a/GameServer/src/msc/gs/model/mini/Damager.java +++ b/GameServer/src/org/moparscape/msc/gs/model/mini/Damager.java @@ -1,6 +1,6 @@ -package msc.gs.model.mini; +package org.moparscape.msc.gs.model.mini; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Player; /** * a Damager (Player) that adds to a pool (Syndicate) of an NPC diff --git a/GameServer/src/msc/gs/model/snapshot/Activity.java b/GameServer/src/org/moparscape/msc/gs/model/snapshot/Activity.java similarity index 82% rename from GameServer/src/msc/gs/model/snapshot/Activity.java rename to GameServer/src/org/moparscape/msc/gs/model/snapshot/Activity.java index d4ec8d6..1bd363f 100644 --- a/GameServer/src/msc/gs/model/snapshot/Activity.java +++ b/GameServer/src/org/moparscape/msc/gs/model/snapshot/Activity.java @@ -1,6 +1,6 @@ -package msc.gs.model.snapshot; +package org.moparscape.msc.gs.model.snapshot; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Player; /** * Activity log class, stores activity string, time of activity and activity owner diff --git a/GameServer/src/msc/gs/model/snapshot/Chatlog.java b/GameServer/src/org/moparscape/msc/gs/model/snapshot/Chatlog.java similarity index 87% rename from GameServer/src/msc/gs/model/snapshot/Chatlog.java rename to GameServer/src/org/moparscape/msc/gs/model/snapshot/Chatlog.java index aca17d7..091bd0c 100644 --- a/GameServer/src/msc/gs/model/snapshot/Chatlog.java +++ b/GameServer/src/org/moparscape/msc/gs/model/snapshot/Chatlog.java @@ -1,9 +1,10 @@ -package msc.gs.model.snapshot; +package org.moparscape.msc.gs.model.snapshot; import java.util.ArrayList; import java.util.List; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Player; + /** * Chat log class, stores chat string, time of message, message owner and set of players that saw the message diff --git a/GameServer/src/msc/gs/model/snapshot/Snapshot.java b/GameServer/src/org/moparscape/msc/gs/model/snapshot/Snapshot.java similarity index 82% rename from GameServer/src/msc/gs/model/snapshot/Snapshot.java rename to GameServer/src/org/moparscape/msc/gs/model/snapshot/Snapshot.java index 8ec51e7..60751cc 100644 --- a/GameServer/src/msc/gs/model/snapshot/Snapshot.java +++ b/GameServer/src/org/moparscape/msc/gs/model/snapshot/Snapshot.java @@ -1,4 +1,4 @@ -package msc.gs.model.snapshot; +package org.moparscape.msc.gs.model.snapshot; /** diff --git a/GameServer/src/msc/gs/npchandler/Aggie.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Aggie.java similarity index 84% rename from GameServer/src/msc/gs/npchandler/Aggie.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/Aggie.java index 9ce74ef..9e2e31e 100644 --- a/GameServer/src/msc/gs/npchandler/Aggie.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Aggie.java @@ -1,15 +1,15 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.MiniEvent; -import msc.gs.event.ShortEvent; -import msc.gs.external.EntityHandler; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; /** * diff --git a/GameServer/src/msc/gs/npchandler/Apothecary.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Apothecary.java similarity index 87% rename from GameServer/src/msc/gs/npchandler/Apothecary.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/Apothecary.java index 4ba65b3..bfdf90b 100644 --- a/GameServer/src/msc/gs/npchandler/Apothecary.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Apothecary.java @@ -1,13 +1,13 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; /** * diff --git a/GameServer/src/msc/gs/npchandler/Bananas.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Bananas.java similarity index 85% rename from GameServer/src/msc/gs/npchandler/Bananas.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/Bananas.java index c0f5908..7d9abd2 100644 --- a/GameServer/src/msc/gs/npchandler/Bananas.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Bananas.java @@ -1,13 +1,13 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; /** * diff --git a/GameServer/src/msc/gs/npchandler/Bankers.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Bankers.java similarity index 70% rename from GameServer/src/msc/gs/npchandler/Bankers.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/Bankers.java index 53e16e3..eebe1e6 100644 --- a/GameServer/src/msc/gs/npchandler/Bankers.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Bankers.java @@ -1,11 +1,11 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class Bankers implements NpcHandler { /** diff --git a/GameServer/src/msc/gs/npchandler/Boat.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Boat.java similarity index 80% rename from GameServer/src/msc/gs/npchandler/Boat.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/Boat.java index d574a5e..565b46d 100644 --- a/GameServer/src/msc/gs/npchandler/Boat.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Boat.java @@ -1,13 +1,13 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class Boat implements NpcHandler { /** diff --git a/GameServer/src/msc/gs/npchandler/Certer.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java similarity index 89% rename from GameServer/src/msc/gs/npchandler/Certer.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java index 06e566d..138dc2f 100644 --- a/GameServer/src/msc/gs/npchandler/Certer.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java @@ -1,15 +1,15 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.external.CerterDef; -import msc.gs.external.EntityHandler; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.external.CerterDef; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class Certer implements NpcHandler { /** diff --git a/GameServer/src/msc/gs/npchandler/EntranaMonks.java b/GameServer/src/org/moparscape/msc/gs/npchandler/EntranaMonks.java similarity index 80% rename from GameServer/src/msc/gs/npchandler/EntranaMonks.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/EntranaMonks.java index 65f728f..5409c79 100644 --- a/GameServer/src/msc/gs/npchandler/EntranaMonks.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/EntranaMonks.java @@ -1,12 +1,12 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class EntranaMonks implements NpcHandler { /** diff --git a/GameServer/src/msc/gs/npchandler/KebabSeller.java b/GameServer/src/org/moparscape/msc/gs/npchandler/KebabSeller.java similarity index 79% rename from GameServer/src/msc/gs/npchandler/KebabSeller.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/KebabSeller.java index 61054f8..81df855 100644 --- a/GameServer/src/msc/gs/npchandler/KebabSeller.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/KebabSeller.java @@ -1,13 +1,13 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class KebabSeller implements NpcHandler { /** diff --git a/GameServer/src/msc/gs/npchandler/MakeOverMage.java b/GameServer/src/org/moparscape/msc/gs/npchandler/MakeOverMage.java similarity index 81% rename from GameServer/src/msc/gs/npchandler/MakeOverMage.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/MakeOverMage.java index 8909f2b..62dad4e 100644 --- a/GameServer/src/msc/gs/npchandler/MakeOverMage.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/MakeOverMage.java @@ -1,12 +1,12 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class MakeOverMage implements NpcHandler { /** diff --git a/GameServer/src/msc/gs/npchandler/MonkHealer.java b/GameServer/src/org/moparscape/msc/gs/npchandler/MonkHealer.java similarity index 80% rename from GameServer/src/msc/gs/npchandler/MonkHealer.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/MonkHealer.java index 9ebc57f..f26c5e6 100644 --- a/GameServer/src/msc/gs/npchandler/MonkHealer.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/MonkHealer.java @@ -1,12 +1,12 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class MonkHealer implements NpcHandler { /** diff --git a/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandler.java b/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandler.java new file mode 100644 index 0000000..1058f03 --- /dev/null +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandler.java @@ -0,0 +1,8 @@ +package org.moparscape.msc.gs.npchandler; + +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; + +public interface NpcHandler { + public void handleNpc(final Npc npc, Player player) throws Exception; +} diff --git a/GameServer/src/msc/gs/npchandler/NpcHandlerDef.java b/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java similarity index 92% rename from GameServer/src/msc/gs/npchandler/NpcHandlerDef.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java index a23787d..d75eb2e 100644 --- a/GameServer/src/msc/gs/npchandler/NpcHandlerDef.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/NpcHandlerDef.java @@ -1,4 +1,4 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; /** * The definition of a npc handler, for use with XStream. diff --git a/GameServer/src/msc/gs/npchandler/OtherNPC.java b/GameServer/src/org/moparscape/msc/gs/npchandler/OtherNPC.java similarity index 85% rename from GameServer/src/msc/gs/npchandler/OtherNPC.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/OtherNPC.java index 32b9434..f578075 100644 --- a/GameServer/src/msc/gs/npchandler/OtherNPC.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/OtherNPC.java @@ -1,12 +1,12 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; /** * diff --git a/GameServer/src/msc/gs/npchandler/ShopKeeper.java b/GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java similarity index 58% rename from GameServer/src/msc/gs/npchandler/ShopKeeper.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java index ed7c087..9a9e0c5 100644 --- a/GameServer/src/msc/gs/npchandler/ShopKeeper.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java @@ -1,13 +1,13 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Shop; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Shop; +import org.moparscape.msc.gs.model.World; public class ShopKeeper implements NpcHandler { /** @@ -26,25 +26,25 @@ public class ShopKeeper implements NpcHandler { if (shop.getGreeting().equals("Good day monsieur, Would you like ze nice freshly baked bread?")) { if (player.npcThief[0] == true) { - player.informOfNpcMessage(new ChatMessage(npc, msc.gs.plugins.extras.Thieving.StealChats[msc.gs.plugins.extras.Thieving.Rands(msc.gs.plugins.extras.Thieving.StealChats.length)], player)); + player.informOfNpcMessage(new ChatMessage(npc, org.moparscape.msc.gs.plugins.extras.Thieving.StealChats[org.moparscape.msc.gs.plugins.extras.Thieving.Rands(org.moparscape.msc.gs.plugins.extras.Thieving.StealChats.length)], player)); return; } } if (player.npcThief[3] == true) { if (shop.getGreeting().equals("Silver! Silver!")) { - player.informOfNpcMessage(new ChatMessage(npc, msc.gs.plugins.extras.Thieving.StealChats[msc.gs.plugins.extras.Thieving.Rands(msc.gs.plugins.extras.Thieving.StealChats.length)], player)); + player.informOfNpcMessage(new ChatMessage(npc, org.moparscape.msc.gs.plugins.extras.Thieving.StealChats[org.moparscape.msc.gs.plugins.extras.Thieving.Rands(org.moparscape.msc.gs.plugins.extras.Thieving.StealChats.length)], player)); return; } } if (player.npcThief[4] == true) { if (shop.getGreeting().equals("Get your exotic spices here, rare very valuable spices here")) { - player.informOfNpcMessage(new ChatMessage(npc, msc.gs.plugins.extras.Thieving.StealChats[msc.gs.plugins.extras.Thieving.Rands(msc.gs.plugins.extras.Thieving.StealChats.length)], player)); + player.informOfNpcMessage(new ChatMessage(npc, org.moparscape.msc.gs.plugins.extras.Thieving.StealChats[org.moparscape.msc.gs.plugins.extras.Thieving.Rands(org.moparscape.msc.gs.plugins.extras.Thieving.StealChats.length)], player)); return; } } if (player.npcThief[5] == true) { if (shop.getGreeting().equals("Here, look at my lovely gems")) { - player.informOfNpcMessage(new ChatMessage(npc, msc.gs.plugins.extras.Thieving.StealChats[msc.gs.plugins.extras.Thieving.Rands(msc.gs.plugins.extras.Thieving.StealChats.length)], player)); + player.informOfNpcMessage(new ChatMessage(npc, org.moparscape.msc.gs.plugins.extras.Thieving.StealChats[org.moparscape.msc.gs.plugins.extras.Thieving.Rands(org.moparscape.msc.gs.plugins.extras.Thieving.StealChats.length)], player)); return; } } diff --git a/GameServer/src/msc/gs/npchandler/ShopKeeper.java.1 b/GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java.1 similarity index 100% rename from GameServer/src/msc/gs/npchandler/ShopKeeper.java.1 rename to GameServer/src/org/moparscape/msc/gs/npchandler/ShopKeeper.java.1 diff --git a/GameServer/src/msc/gs/npchandler/Tanner.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Tanner.java similarity index 84% rename from GameServer/src/msc/gs/npchandler/Tanner.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/Tanner.java index 5550f82..886ccd0 100644 --- a/GameServer/src/msc/gs/npchandler/Tanner.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Tanner.java @@ -1,14 +1,14 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.DelayedEvent; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class Tanner implements NpcHandler { /** diff --git a/GameServer/src/msc/gs/npchandler/Thrander.java b/GameServer/src/org/moparscape/msc/gs/npchandler/Thrander.java similarity index 72% rename from GameServer/src/msc/gs/npchandler/Thrander.java rename to GameServer/src/org/moparscape/msc/gs/npchandler/Thrander.java index 614bc57..5a1d281 100644 --- a/GameServer/src/msc/gs/npchandler/Thrander.java +++ b/GameServer/src/org/moparscape/msc/gs/npchandler/Thrander.java @@ -1,11 +1,11 @@ -package msc.gs.npchandler; +package org.moparscape.msc.gs.npchandler; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; public class Thrander implements NpcHandler { /** diff --git a/GameServer/src/msc/gs/phandler/PacketHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandler.java similarity index 61% rename from GameServer/src/msc/gs/phandler/PacketHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/PacketHandler.java index b902ff0..c163007 100644 --- a/GameServer/src/msc/gs/phandler/PacketHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandler.java @@ -1,8 +1,8 @@ -package msc.gs.phandler; +package org.moparscape.msc.gs.phandler; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.connection.Packet; -import msc.gs.connection.Packet; public interface PacketHandler { public void handlePacket(Packet p, IoSession session) throws Exception; diff --git a/LoginServer/src/rsca/ls/packethandler/PacketHandlerDef.java b/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDef.java similarity index 92% rename from LoginServer/src/rsca/ls/packethandler/PacketHandlerDef.java rename to GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDef.java index 9eaca41..abbcbaf 100644 --- a/LoginServer/src/rsca/ls/packethandler/PacketHandlerDef.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/PacketHandlerDef.java @@ -1,4 +1,4 @@ -package rsca.ls.packethandler; +package org.moparscape.msc.gs.phandler; /** * The definition of a packet handler, for use with XStream. diff --git a/GameServer/src/msc/gs/phandler/PlayerLogin.java b/GameServer/src/org/moparscape/msc/gs/phandler/PlayerLogin.java similarity index 89% rename from GameServer/src/msc/gs/phandler/PlayerLogin.java rename to GameServer/src/org/moparscape/msc/gs/phandler/PlayerLogin.java index e696b9c..1ffd96c 100644 --- a/GameServer/src/msc/gs/phandler/PlayerLogin.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/PlayerLogin.java @@ -1,21 +1,21 @@ -package msc.gs.phandler; +package org.moparscape.msc.gs.phandler; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.RSCPacketBuilder; +import org.moparscape.msc.gs.model.Bank; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Inventory; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.PlayerAppearance; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.client.WieldHandler; +import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.builders.RSCPacketBuilder; -import msc.gs.model.Bank; -import msc.gs.model.InvItem; -import msc.gs.model.Inventory; -import msc.gs.model.Player; -import msc.gs.model.PlayerAppearance; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.phandler.client.WieldHandler; -import msc.gs.quest.Quest; -import msc.gs.tools.DataConversions; public class PlayerLogin implements PacketHandler { /** @@ -32,7 +32,7 @@ public class PlayerLogin implements PacketHandler { this.player = player; } - public void handlePacket(msc.gs.connection.Packet p, IoSession session) throws Exception { + public void handlePacket(org.moparscape.msc.gs.connection.Packet p, IoSession session) throws Exception { byte loginCode = p.readByte(); if(world.getPlayer(player.getUsernameHash()) != null) { Exception e = new Exception("Double log from " + player.getUsername() + " | " + player.getUsernameHash()); @@ -163,7 +163,7 @@ public class PlayerLogin implements PacketHandler { player.updateViewedPlayers(); player.updateViewedObjects(); - msc.gs.builders.MiscPacketBuilder sender = player.getActionSender(); + org.moparscape.msc.gs.builders.MiscPacketBuilder sender = player.getActionSender(); sender.sendServerInfo(); sender.sendFatigue(); sender.sendWorldInfo(); // sends info for the client to load terrain diff --git a/GameServer/src/msc/gs/phandler/client/AttackHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/AttackHandler.java similarity index 89% rename from GameServer/src/msc/gs/phandler/client/AttackHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/AttackHandler.java index 3fddf11..a4c1ffd 100644 --- a/GameServer/src/msc/gs/phandler/client/AttackHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/AttackHandler.java @@ -1,25 +1,25 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.event.FightEvent; +import org.moparscape.msc.gs.event.RangeEvent; +import org.moparscape.msc.gs.event.WalkToMobEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.PathGenerator; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.event.FightEvent; -import msc.gs.event.RangeEvent; -import msc.gs.event.WalkToMobEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.PathGenerator; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; public class AttackHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/BankHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/BankHandler.java similarity index 87% rename from GameServer/src/msc/gs/phandler/client/BankHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/BankHandler.java index 3eae1b4..35118d0 100644 --- a/GameServer/src/msc/gs/phandler/client/BankHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/BankHandler.java @@ -1,18 +1,18 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.model.Bank; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Inventory; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.external.EntityHandler; -import msc.gs.model.Bank; -import msc.gs.model.InvItem; -import msc.gs.model.Inventory; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; public class BankHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/BotHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/BotHandler.java similarity index 81% rename from GameServer/src/msc/gs/phandler/client/BotHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/BotHandler.java index 9ec16d4..2d6fa23 100644 --- a/GameServer/src/msc/gs/phandler/client/BotHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/BotHandler.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class BotHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/ChatHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/ChatHandler.java similarity index 64% rename from GameServer/src/msc/gs/phandler/client/ChatHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/ChatHandler.java index bb7ac22..b0a2f44 100644 --- a/GameServer/src/msc/gs/phandler/client/ChatHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/ChatHandler.java @@ -1,12 +1,12 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class ChatHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/CommandHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.java similarity index 88% rename from GameServer/src/msc/gs/phandler/client/CommandHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.java index 3cebba8..cedbf96 100644 --- a/GameServer/src/msc/gs/phandler/client/CommandHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/CommandHandler.java @@ -1,4 +1,4 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.util.ArrayList; import java.util.Iterator; @@ -7,30 +7,30 @@ import java.util.GregorianCalendar; import java.util.TimeZone; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.MiscPacketBuilder; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.core.ClientUpdater; +import org.moparscape.msc.gs.db.DBConnection; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.CombatState; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.builders.ls.MiscPacketBuilder; -import msc.gs.connection.Packet; -import msc.gs.core.ClientUpdater; -import msc.gs.db.DBConnection; -import msc.gs.event.MiniEvent; -import msc.gs.event.SingleEvent; -import msc.gs.external.EntityHandler; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.model.MenuHandler; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.CombatState; -import msc.gs.tools.DataConversions; -import msc.gs.util.Logger; public class CommandHandler implements PacketHandler { /** @@ -163,7 +163,7 @@ public class CommandHandler implements PacketHandler { } if (cmd.equals("info2")) { - Player p = world.getPlayer(msc.gs.tools.DataConversions.usernameToHash(args[0])); + Player p = world.getPlayer(org.moparscape.msc.gs.tools.DataConversions.usernameToHash(args[0])); if (p == null) { player.getActionSender().sendMessage(args[0] + " is offline?"); return; diff --git a/GameServer/src/msc/gs/phandler/client/DropHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java similarity index 75% rename from GameServer/src/msc/gs/phandler/client/DropHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java index 7f9e311..d67f350 100644 --- a/GameServer/src/msc/gs/phandler/client/DropHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/DropHandler.java @@ -1,18 +1,18 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.db.DBConnection; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.db.DBConnection; -import msc.gs.event.DelayedEvent; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; public class DropHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/DuelHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java similarity index 93% rename from GameServer/src/msc/gs/phandler/client/DuelHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java index 7c71e93..fa2b485 100644 --- a/GameServer/src/msc/gs/phandler/client/DuelHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/DuelHandler.java @@ -1,25 +1,25 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.event.DuelEvent; +import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.event.WalkToMobEvent; +import org.moparscape.msc.gs.external.ItemDef; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Inventory; +import org.moparscape.msc.gs.model.PathGenerator; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.event.DuelEvent; -import msc.gs.event.SingleEvent; -import msc.gs.event.WalkToMobEvent; -import msc.gs.external.ItemDef; -import msc.gs.model.InvItem; -import msc.gs.model.Inventory; -import msc.gs.model.PathGenerator; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; -import msc.gs.util.Logger; public class DuelHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/DummyPacket.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java similarity index 69% rename from GameServer/src/msc/gs/phandler/client/DummyPacket.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java index 147b548..30fa337 100644 --- a/GameServer/src/msc/gs/phandler/client/DummyPacket.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java @@ -1,11 +1,11 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.builders.RSCPacketBuilder; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.builders.RSCPacketBuilder; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.phandler.PacketHandler; public class DummyPacket implements PacketHandler { diff --git a/GameServer/src/msc/gs/phandler/client/ExceptionHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/ExceptionHandler.java similarity index 65% rename from GameServer/src/msc/gs/phandler/client/ExceptionHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/ExceptionHandler.java index a06452b..10a6c7d 100644 --- a/GameServer/src/msc/gs/phandler/client/ExceptionHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/ExceptionHandler.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class ExceptionHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/FollowRequest.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/FollowRequest.java similarity index 75% rename from GameServer/src/msc/gs/phandler/client/FollowRequest.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/FollowRequest.java index e92c37a..e8a041b 100644 --- a/GameServer/src/msc/gs/phandler/client/FollowRequest.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/FollowRequest.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; public class FollowRequest implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/FriendHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/FriendHandler.java similarity index 81% rename from GameServer/src/msc/gs/phandler/client/FriendHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/FriendHandler.java index d1c6f99..284d28b 100644 --- a/GameServer/src/msc/gs/phandler/client/FriendHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/FriendHandler.java @@ -1,20 +1,20 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.util.ArrayList; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.MiscPacketBuilder; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.model.snapshot.Chatlog; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.builders.ls.MiscPacketBuilder; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.model.snapshot.Chatlog; -import msc.gs.phandler.PacketHandler; -import msc.gs.tools.DataConversions; -import msc.gs.util.Logger; public class FriendHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/GameSettingHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/GameSettingHandler.java similarity index 67% rename from GameServer/src/msc/gs/phandler/client/GameSettingHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/GameSettingHandler.java index 77f53f7..201c9a0 100644 --- a/GameServer/src/msc/gs/phandler/client/GameSettingHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/GameSettingHandler.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.GameSettingUpdatePacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.builders.ls.GameSettingUpdatePacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class GameSettingHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/InvActionHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java similarity index 96% rename from GameServer/src/msc/gs/phandler/client/InvActionHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java index e41114f..4442b27 100644 --- a/GameServer/src/msc/gs/phandler/client/InvActionHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java @@ -1,26 +1,26 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.Server; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.external.ItemUnIdentHerbDef; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.config.Constants; -import msc.gs.Instance; -import msc.gs.Server; -import msc.gs.connection.Packet; -import msc.gs.event.DelayedEvent; -import msc.gs.event.MiniEvent; -import msc.gs.event.SingleEvent; -import msc.gs.external.ItemUnIdentHerbDef; -import msc.gs.model.ActiveTile; -import msc.gs.model.Bubble; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.tools.DataConversions; public class InvActionHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/InvUseOnGroundItem.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java similarity index 83% rename from GameServer/src/msc/gs/phandler/client/InvUseOnGroundItem.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java index fd48d70..27db436 100644 --- a/GameServer/src/msc/gs/phandler/client/InvUseOnGroundItem.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnGroundItem.java @@ -1,27 +1,27 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.event.WalkToPointEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.FiremakingDef; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.event.DelayedEvent; -import msc.gs.event.ShortEvent; -import msc.gs.event.WalkToPointEvent; -import msc.gs.external.EntityHandler; -import msc.gs.external.FiremakingDef; -import msc.gs.model.ActiveTile; -import msc.gs.model.Bubble; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; public class InvUseOnGroundItem implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/InvUseOnItem.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java similarity index 97% rename from GameServer/src/msc/gs/phandler/client/InvUseOnItem.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java index f8b2c45..d52525e 100644 --- a/GameServer/src/msc/gs/phandler/client/InvUseOnItem.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnItem.java @@ -1,28 +1,28 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.Server; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.ItemArrowHeadDef; +import org.moparscape.msc.gs.external.ItemBowStringDef; +import org.moparscape.msc.gs.external.ItemDartTipDef; +import org.moparscape.msc.gs.external.ItemGemDef; +import org.moparscape.msc.gs.external.ItemHerbDef; +import org.moparscape.msc.gs.external.ItemHerbSecond; +import org.moparscape.msc.gs.external.ItemLogCutDef; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.Server; -import msc.gs.connection.Packet; -import msc.gs.event.MiniEvent; -import msc.gs.external.EntityHandler; -import msc.gs.external.ItemArrowHeadDef; -import msc.gs.external.ItemBowStringDef; -import msc.gs.external.ItemDartTipDef; -import msc.gs.external.ItemGemDef; -import msc.gs.external.ItemHerbDef; -import msc.gs.external.ItemHerbSecond; -import msc.gs.external.ItemLogCutDef; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.tools.DataConversions; public class InvUseOnItem implements PacketHandler { static int[] capes = { 183, 209, 229, 511, 512, 513, 514 }; diff --git a/GameServer/src/msc/gs/phandler/client/InvUseOnNpc.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnNpc.java similarity index 90% rename from GameServer/src/msc/gs/phandler/client/InvUseOnNpc.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnNpc.java index 728d165..bd2710a 100644 --- a/GameServer/src/msc/gs/phandler/client/InvUseOnNpc.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnNpc.java @@ -1,20 +1,20 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.event.WalkToMobEvent; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.event.ShortEvent; -import msc.gs.event.WalkToMobEvent; -import msc.gs.model.Bubble; -import msc.gs.model.InvItem; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; public class InvUseOnNpc implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/InvUseOnObject.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java similarity index 95% rename from GameServer/src/msc/gs/phandler/client/InvUseOnObject.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java index a59d223..1b2af70 100644 --- a/GameServer/src/msc/gs/phandler/client/InvUseOnObject.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnObject.java @@ -1,41 +1,41 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.util.List; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.Server; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.event.WalkToObjectEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.ItemCookingDef; +import org.moparscape.msc.gs.external.ItemCraftingDef; +import org.moparscape.msc.gs.external.ItemSmeltingDef; +import org.moparscape.msc.gs.external.ItemSmithingDef; +import org.moparscape.msc.gs.external.ItemWieldableDef; +import org.moparscape.msc.gs.external.ReqOreDef; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.plugins.quests.Dorics; +import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.Server; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.event.MiniEvent; -import msc.gs.event.ShortEvent; -import msc.gs.event.WalkToObjectEvent; -import msc.gs.external.EntityHandler; -import msc.gs.external.ItemCookingDef; -import msc.gs.external.ItemCraftingDef; -import msc.gs.external.ItemSmeltingDef; -import msc.gs.external.ItemSmithingDef; -import msc.gs.external.ItemWieldableDef; -import msc.gs.external.ReqOreDef; -import msc.gs.model.ActiveTile; -import msc.gs.model.Bubble; -import msc.gs.model.ChatMessage; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.plugins.quests.Dorics; -import msc.gs.quest.Quest; -import msc.gs.quest.QuestAction; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; -import msc.gs.util.Logger; public class InvUseOnObject implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/InvUseOnPlayer.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnPlayer.java similarity index 83% rename from GameServer/src/msc/gs/phandler/client/InvUseOnPlayer.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnPlayer.java index 2b2647d..a7caf76 100644 --- a/GameServer/src/msc/gs/phandler/client/InvUseOnPlayer.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvUseOnPlayer.java @@ -1,19 +1,19 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.event.WalkToMobEvent; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.event.ShortEvent; -import msc.gs.event.WalkToMobEvent; -import msc.gs.model.Bubble; -import msc.gs.model.InvItem; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; public class InvUseOnPlayer implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/MenuReplyHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/MenuReplyHandler.java similarity index 68% rename from GameServer/src/msc/gs/phandler/client/MenuReplyHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/MenuReplyHandler.java index b24f59a..fc518bd 100644 --- a/GameServer/src/msc/gs/phandler/client/MenuReplyHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/MenuReplyHandler.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.MenuHandler; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class MenuReplyHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/NpcCommand.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/NpcCommand.java similarity index 69% rename from GameServer/src/msc/gs/phandler/client/NpcCommand.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/NpcCommand.java index 4cb7187..e016add 100644 --- a/GameServer/src/msc/gs/phandler/client/NpcCommand.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/NpcCommand.java @@ -1,16 +1,16 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.plugins.extras.Thieving; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.plugins.extras.Thieving; public class NpcCommand implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/ObjectAction.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java similarity index 94% rename from GameServer/src/msc/gs/phandler/client/ObjectAction.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java index d63a6fb..3ca2de4 100644 --- a/GameServer/src/msc/gs/phandler/client/ObjectAction.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/ObjectAction.java @@ -1,44 +1,44 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.util.ArrayList; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.Server; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.event.WalkToObjectEvent; +import org.moparscape.msc.gs.external.AgilityCourseDef; +import org.moparscape.msc.gs.external.AgilityDef; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.GameObjectDef; +import org.moparscape.msc.gs.external.ObjectFishDef; +import org.moparscape.msc.gs.external.ObjectFishingDef; +import org.moparscape.msc.gs.external.ObjectWoodcuttingDef; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Path; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.plugins.extras.Thieving; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.Server; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.event.DelayedEvent; -import msc.gs.event.MiniEvent; -import msc.gs.event.ShortEvent; -import msc.gs.event.SingleEvent; -import msc.gs.event.WalkToObjectEvent; -import msc.gs.external.AgilityCourseDef; -import msc.gs.external.AgilityDef; -import msc.gs.external.EntityHandler; -import msc.gs.external.GameObjectDef; -import msc.gs.external.ObjectFishDef; -import msc.gs.external.ObjectFishingDef; -import msc.gs.external.ObjectWoodcuttingDef; -import msc.gs.model.ActiveTile; -import msc.gs.model.Bubble; -import msc.gs.model.ChatMessage; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Path; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.plugins.extras.Thieving; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; public class ObjectAction implements PacketHandler { /** @@ -233,7 +233,7 @@ public class ObjectAction implements PacketHandler { else if (object.getID() == 52 || object.getID() == 173 && object.containsItem() == 29) // hopper { owner.getActionSender().sendMessage("You operate the hopper.."); - Instance.getDelayedEventHandler().add(new msc.gs.event.MiniEvent(owner, 1000) { + Instance.getDelayedEventHandler().add(new org.moparscape.msc.gs.event.MiniEvent(owner, 1000) { public void action() { owner.getActionSender().sendMessage("The grain slides down the chute"); } diff --git a/GameServer/src/msc/gs/phandler/client/PickupItem.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PickupItem.java similarity index 79% rename from GameServer/src/msc/gs/phandler/client/PickupItem.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/PickupItem.java index f417fd5..d38936a 100644 --- a/GameServer/src/msc/gs/phandler/client/PickupItem.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PickupItem.java @@ -1,27 +1,27 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.MiscPacketBuilder; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.db.DBConnection; +import org.moparscape.msc.gs.event.FightEvent; +import org.moparscape.msc.gs.event.WalkToPointEvent; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.builders.ls.MiscPacketBuilder; -import msc.gs.connection.Packet; -import msc.gs.db.DBConnection; -import msc.gs.event.FightEvent; -import msc.gs.event.WalkToPointEvent; -import msc.gs.model.ActiveTile; -import msc.gs.model.ChatMessage; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; public class PickupItem implements PacketHandler { /** @@ -52,7 +52,7 @@ public class PickupItem implements PacketHandler { final ActiveTile tile = world.getTile(location); final Item item = getItem(id, tile, player); if(!item.getDef().canTrade()) { - if(item.droppedby() != 0 && msc.gs.tools.DataConversions.usernameToHash(player.getUsername()) != item.droppedby()) { + if(item.droppedby() != 0 && org.moparscape.msc.gs.tools.DataConversions.usernameToHash(player.getUsername()) != item.droppedby()) { player.getActionSender().sendMessage("This item is non-tradable."); return; } @@ -131,7 +131,7 @@ public class PickupItem implements PacketHandler { // Code goes here if they picked up some BS items. MiscPacketBuilder loginServer = Instance.getServer().getLoginConnector().getActionSender(); final long droppedby = item.droppedby(); - final long playerLong = msc.gs.tools.DataConversions.usernameToHash(owner.getUsername()); + final long playerLong = org.moparscape.msc.gs.tools.DataConversions.usernameToHash(owner.getUsername()); loginServer.tradeLog(droppedby, playerLong, item.getID(), item.getAmount(), owner.getX(), owner.getY(), 3); } world.addEntryToSnapshots(new Activity(owner.getUsername(),owner.getUsername() + " picked up an item "+item.getDef().getName()+" (" + item.getID() + ") amount: " + item.getAmount() + " at: " + owner.getX() + "/" + owner.getY() + "|" + item.getX() + "/" + item.getY())); diff --git a/GameServer/src/msc/gs/phandler/client/Ping.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/Ping.java similarity index 66% rename from GameServer/src/msc/gs/phandler/client/Ping.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/Ping.java index ffcbcc7..53484c9 100644 --- a/GameServer/src/msc/gs/phandler/client/Ping.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/Ping.java @@ -1,11 +1,11 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class Ping implements PacketHandler { public void handlePacket(Packet p, IoSession session) throws Exception { diff --git a/GameServer/src/msc/gs/phandler/client/PlayerAppearanceIDHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceIDHandler.java similarity index 69% rename from GameServer/src/msc/gs/phandler/client/PlayerAppearanceIDHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceIDHandler.java index 65c8a64..4f86145 100644 --- a/GameServer/src/msc/gs/phandler/client/PlayerAppearanceIDHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceIDHandler.java @@ -1,12 +1,12 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class PlayerAppearanceIDHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/PlayerAppearanceUpdater.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceUpdater.java similarity index 82% rename from GameServer/src/msc/gs/phandler/client/PlayerAppearanceUpdater.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceUpdater.java index c0ba2a3..fbbfc67 100644 --- a/GameServer/src/msc/gs/phandler/client/PlayerAppearanceUpdater.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerAppearanceUpdater.java @@ -1,15 +1,15 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Inventory; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.PlayerAppearance; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.InvItem; -import msc.gs.model.Inventory; -import msc.gs.model.Player; -import msc.gs.model.PlayerAppearance; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class PlayerAppearanceUpdater implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/PlayerLogin.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java similarity index 79% rename from GameServer/src/msc/gs/phandler/client/PlayerLogin.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java index 111641a..0d98abe 100644 --- a/GameServer/src/msc/gs/phandler/client/PlayerLogin.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java @@ -1,18 +1,18 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.net.InetSocketAddress; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.RSCPacketBuilder; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; +import org.moparscape.msc.gs.util.RSA; -import msc.config.Config; -import msc.gs.Instance; -import msc.gs.builders.RSCPacketBuilder; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; -import msc.gs.util.RSA; public class PlayerLogin implements PacketHandler { diff --git a/GameServer/src/msc/gs/phandler/client/PlayerLogout.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogout.java similarity index 55% rename from GameServer/src/msc/gs/phandler/client/PlayerLogout.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogout.java index 7af0f41..d7c9991 100644 --- a/GameServer/src/msc/gs/phandler/client/PlayerLogout.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogout.java @@ -1,11 +1,11 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class PlayerLogout implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/PlayerLogoutRequest.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogoutRequest.java similarity index 60% rename from GameServer/src/msc/gs/phandler/client/PlayerLogoutRequest.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogoutRequest.java index 9e57817..40f4295 100644 --- a/GameServer/src/msc/gs/phandler/client/PlayerLogoutRequest.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogoutRequest.java @@ -1,12 +1,12 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class PlayerLogoutRequest implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/PrayerHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java similarity index 86% rename from GameServer/src/msc/gs/phandler/client/PrayerHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java index 344919a..a5a6ede 100644 --- a/GameServer/src/msc/gs/phandler/client/PrayerHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PrayerHandler.java @@ -1,15 +1,15 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.PrayerDef; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.external.EntityHandler; -import msc.gs.external.PrayerDef; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class PrayerHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/PrivacySettingHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PrivacySettingHandler.java similarity index 73% rename from GameServer/src/msc/gs/phandler/client/PrivacySettingHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/PrivacySettingHandler.java index 8ae3eee..cb866fb 100644 --- a/GameServer/src/msc/gs/phandler/client/PrivacySettingHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PrivacySettingHandler.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.PrivacySettingUpdatePacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.builders.ls.PrivacySettingUpdatePacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class PrivacySettingHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/ReportHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/ReportHandler.java similarity index 74% rename from GameServer/src/msc/gs/phandler/client/ReportHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/ReportHandler.java index f42f971..adc102f 100644 --- a/GameServer/src/msc/gs/phandler/client/ReportHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/ReportHandler.java @@ -1,15 +1,15 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.db.ReportHandlerQueries; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.db.ReportHandlerQueries; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.tools.DataConversions; public class ReportHandler implements PacketHandler { diff --git a/GameServer/src/msc/gs/phandler/client/SessionRequest.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/SessionRequest.java similarity index 64% rename from GameServer/src/msc/gs/phandler/client/SessionRequest.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/SessionRequest.java index 4db56fd..a28e725 100644 --- a/GameServer/src/msc/gs/phandler/client/SessionRequest.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/SessionRequest.java @@ -1,15 +1,15 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.RSCPacketBuilder; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.builders.RSCPacketBuilder; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class SessionRequest implements PacketHandler { diff --git a/GameServer/src/msc/gs/phandler/client/ShopHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/ShopHandler.java similarity index 86% rename from GameServer/src/msc/gs/phandler/client/ShopHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/ShopHandler.java index 64ffc6a..90f31c9 100644 --- a/GameServer/src/msc/gs/phandler/client/ShopHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/ShopHandler.java @@ -1,19 +1,19 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Inventory; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Shop; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.model.InvItem; -import msc.gs.model.Inventory; -import msc.gs.model.Player; -import msc.gs.model.Shop; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class ShopHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/Sleepword.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/Sleepword.java similarity index 80% rename from GameServer/src/msc/gs/phandler/client/Sleepword.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/Sleepword.java index c38f4c9..f2fb98d 100644 --- a/GameServer/src/msc/gs/phandler/client/Sleepword.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/Sleepword.java @@ -3,18 +3,18 @@ * @date 2008, 7th of june */ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class Sleepword implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/SpellHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java similarity index 94% rename from GameServer/src/msc/gs/phandler/client/SpellHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java index f1f9b06..1ab82c8 100644 --- a/GameServer/src/msc/gs/phandler/client/SpellHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/SpellHandler.java @@ -1,4 +1,4 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.util.ArrayList; import java.util.Iterator; @@ -8,36 +8,36 @@ import java.util.TreeMap; import java.util.Map.Entry; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.event.FightEvent; +import org.moparscape.msc.gs.event.ObjectRemover; +import org.moparscape.msc.gs.event.WalkMobToMobEvent; +import org.moparscape.msc.gs.event.WalkToMobEvent; +import org.moparscape.msc.gs.event.WalkToPointEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.ItemSmeltingDef; +import org.moparscape.msc.gs.external.ReqOreDef; +import org.moparscape.msc.gs.external.SpellDef; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.PathGenerator; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Projectile; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.mini.Damager; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.tools.DataConversions; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.event.FightEvent; -import msc.gs.event.ObjectRemover; -import msc.gs.event.WalkMobToMobEvent; -import msc.gs.event.WalkToMobEvent; -import msc.gs.event.WalkToPointEvent; -import msc.gs.external.EntityHandler; -import msc.gs.external.ItemSmeltingDef; -import msc.gs.external.ReqOreDef; -import msc.gs.external.SpellDef; -import msc.gs.model.ActiveTile; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.PathGenerator; -import msc.gs.model.Player; -import msc.gs.model.Projectile; -import msc.gs.model.World; -import msc.gs.model.mini.Damager; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; -import msc.gs.tools.DataConversions; public class SpellHandler implements PacketHandler { static int[] spellDamage = {}; diff --git a/GameServer/src/msc/gs/phandler/client/StyleHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/StyleHandler.java similarity index 63% rename from GameServer/src/msc/gs/phandler/client/StyleHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/StyleHandler.java index aa1ad19..702b7e6 100644 --- a/GameServer/src/msc/gs/phandler/client/StyleHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/StyleHandler.java @@ -1,12 +1,12 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class StyleHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/TalkToNpcHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java similarity index 83% rename from GameServer/src/msc/gs/phandler/client/TalkToNpcHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java index f2d791c..63f4dec 100644 --- a/GameServer/src/msc/gs/phandler/client/TalkToNpcHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/TalkToNpcHandler.java @@ -1,24 +1,24 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.lang.reflect.InvocationTargetException; import java.util.ConcurrentModificationException; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.event.WalkToMobEvent; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Script; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.npchandler.NpcHandler; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.event.WalkToMobEvent; -import msc.gs.model.ChatMessage; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Script; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.npchandler.NpcHandler; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; -import msc.gs.util.Logger; public class TalkToNpcHandler implements PacketHandler { /** @@ -115,7 +115,7 @@ public class TalkToNpcHandler implements PacketHandler { owner.interpreterThread.start(); } else { try { - NpcHandler hand = new msc.gs.npchandler.OtherNPC(); + NpcHandler hand = new org.moparscape.msc.gs.npchandler.OtherNPC(); hand.handleNpc(affectedNpc, owner); } catch (Exception e) { Logger.error("Exception with npc[" + affectedNpc.getIndex() + "] from " + owner.getUsername() + " [" + owner.getCurrentIP() + "]: " + e.getMessage()); diff --git a/GameServer/src/msc/gs/phandler/client/TradeHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java similarity index 93% rename from GameServer/src/msc/gs/phandler/client/TradeHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java index 3fecf72..c509a81 100644 --- a/GameServer/src/msc/gs/phandler/client/TradeHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/TradeHandler.java @@ -1,25 +1,25 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.util.ArrayList; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.MiscPacketBuilder; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.db.DBConnection; +import org.moparscape.msc.gs.external.ItemDef; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Inventory; +import org.moparscape.msc.gs.model.PathGenerator; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.tools.DataConversions; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.builders.ls.MiscPacketBuilder; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.db.DBConnection; -import msc.gs.external.ItemDef; -import msc.gs.model.InvItem; -import msc.gs.model.Inventory; -import msc.gs.model.PathGenerator; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.tools.DataConversions; -import msc.gs.util.Logger; public class TradeHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/Trap.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/Trap.java similarity index 57% rename from GameServer/src/msc/gs/phandler/client/Trap.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/Trap.java index 8397e65..afe5d41 100644 --- a/GameServer/src/msc/gs/phandler/client/Trap.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/Trap.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class Trap implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/TrapHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/TrapHandler.java similarity index 56% rename from GameServer/src/msc/gs/phandler/client/TrapHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/TrapHandler.java index 33dc9eb..58b94ef 100644 --- a/GameServer/src/msc/gs/phandler/client/TrapHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/TrapHandler.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class TrapHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/WalkRequest.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java similarity index 86% rename from GameServer/src/msc/gs/phandler/client/WalkRequest.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java index 0347be5..0db2ca7 100644 --- a/GameServer/src/msc/gs/phandler/client/WalkRequest.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/WalkRequest.java @@ -1,21 +1,21 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.event.FightEvent; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.event.WalkMobToMobEvent; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Path; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.states.CombatState; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.event.FightEvent; -import msc.gs.event.MiniEvent; -import msc.gs.event.WalkMobToMobEvent; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Path; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.states.Action; -import msc.gs.states.CombatState; public class WalkRequest implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/WallObjectAction.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java similarity index 90% rename from GameServer/src/msc/gs/phandler/client/WallObjectAction.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java index 5b7dc69..82fcfe3 100644 --- a/GameServer/src/msc/gs/phandler/client/WallObjectAction.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/WallObjectAction.java @@ -1,26 +1,26 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.Server; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.event.WalkToPointEvent; +import org.moparscape.msc.gs.external.DoorDef; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.model.snapshot.Activity; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.plugins.extras.Thieving; +import org.moparscape.msc.gs.states.Action; -import msc.gs.Instance; -import msc.gs.Server; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.event.ShortEvent; -import msc.gs.event.WalkToPointEvent; -import msc.gs.external.DoorDef; -import msc.gs.external.EntityHandler; -import msc.gs.model.ActiveTile; -import msc.gs.model.ChatMessage; -import msc.gs.model.GameObject; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.model.snapshot.Activity; -import msc.gs.phandler.PacketHandler; -import msc.gs.plugins.extras.Thieving; -import msc.gs.states.Action; public class WallObjectAction implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/client/WieldHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/WieldHandler.java similarity index 89% rename from GameServer/src/msc/gs/phandler/client/WieldHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/client/WieldHandler.java index d2fa40a..fc26472 100644 --- a/GameServer/src/msc/gs/phandler/client/WieldHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/WieldHandler.java @@ -1,22 +1,22 @@ -package msc.gs.phandler.client; +package org.moparscape.msc.gs.phandler.client; import java.util.ArrayList; import java.util.Map.Entry; import org.apache.mina.common.IoSession; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Script; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.quest.Quest; -import msc.config.Constants; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.connection.Packet; -import msc.gs.connection.RSCPacket; -import msc.gs.external.EntityHandler; -import msc.gs.model.InvItem; -import msc.gs.model.Player; -import msc.gs.model.Script; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.quest.Quest; public class WieldHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/AlertHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/AlertHandler.java similarity index 58% rename from GameServer/src/msc/gs/phandler/ls/AlertHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/AlertHandler.java index 34b07b3..e1f27c5 100644 --- a/GameServer/src/msc/gs/phandler/ls/AlertHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/AlertHandler.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class AlertHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/ForceLogout.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/ForceLogout.java similarity index 57% rename from GameServer/src/msc/gs/phandler/ls/ForceLogout.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/ForceLogout.java index 07f8966..a18c7e8 100644 --- a/GameServer/src/msc/gs/phandler/ls/ForceLogout.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/ForceLogout.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class ForceLogout implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/FriendLogin.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogin.java similarity index 61% rename from GameServer/src/msc/gs/phandler/ls/FriendLogin.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogin.java index 4f08667..37e2112 100644 --- a/GameServer/src/msc/gs/phandler/ls/FriendLogin.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogin.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class FriendLogin implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/FriendLogout.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogout.java similarity index 67% rename from GameServer/src/msc/gs/phandler/ls/FriendLogout.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogout.java index ce1c085..bc4293c 100644 --- a/GameServer/src/msc/gs/phandler/ls/FriendLogout.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/FriendLogout.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class FriendLogout implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/GlobalHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/GlobalHandler.java similarity index 57% rename from GameServer/src/msc/gs/phandler/ls/GlobalHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/GlobalHandler.java index c80497b..57d15ba 100644 --- a/GameServer/src/msc/gs/phandler/ls/GlobalHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/GlobalHandler.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class GlobalHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/PlayerInfoRequestHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerInfoRequestHandler.java similarity index 61% rename from GameServer/src/msc/gs/phandler/ls/PlayerInfoRequestHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerInfoRequestHandler.java index f1b553e..8a92074 100644 --- a/GameServer/src/msc/gs/phandler/ls/PlayerInfoRequestHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerInfoRequestHandler.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.PlayerInfoRequestPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.builders.ls.PlayerInfoRequestPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class PlayerInfoRequestHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/PlayerListRequestHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerListRequestHandler.java similarity index 58% rename from GameServer/src/msc/gs/phandler/ls/PlayerListRequestHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerListRequestHandler.java index 5141115..0435847 100644 --- a/GameServer/src/msc/gs/phandler/ls/PlayerListRequestHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/PlayerListRequestHandler.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.PlayerListRequestPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.builders.ls.PlayerListRequestPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class PlayerListRequestHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/ReceivePM.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/ReceivePM.java similarity index 68% rename from GameServer/src/msc/gs/phandler/ls/ReceivePM.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/ReceivePM.java index 16ad0a2..3011b5b 100644 --- a/GameServer/src/msc/gs/phandler/ls/ReceivePM.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/ReceivePM.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; -import msc.gs.Instance; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; public class ReceivePM implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/ReportInfoRequestHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/ReportInfoRequestHandler.java similarity index 60% rename from GameServer/src/msc/gs/phandler/ls/ReportInfoRequestHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/ReportInfoRequestHandler.java index f976914..2c9f543 100644 --- a/GameServer/src/msc/gs/phandler/ls/ReportInfoRequestHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/ReportInfoRequestHandler.java @@ -1,15 +1,15 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.ReportInfoRequestPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.builders.ls.ReportInfoRequestPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class ReportInfoRequestHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/ShutdownHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/ShutdownHandler.java similarity index 54% rename from GameServer/src/msc/gs/phandler/ls/ShutdownHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/ShutdownHandler.java index 2af2905..f43689b 100644 --- a/GameServer/src/msc/gs/phandler/ls/ShutdownHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/ShutdownHandler.java @@ -1,13 +1,13 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class ShutdownHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/StatRequestHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/StatRequestHandler.java similarity index 58% rename from GameServer/src/msc/gs/phandler/ls/StatRequestHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/StatRequestHandler.java index 856ea5c..15e9ebb 100644 --- a/GameServer/src/msc/gs/phandler/ls/StatRequestHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/StatRequestHandler.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.StatRequestPacketBuilder; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.builders.ls.StatRequestPacketBuilder; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class StatRequestHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/phandler/ls/UpdateHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/ls/UpdateHandler.java similarity index 63% rename from GameServer/src/msc/gs/phandler/ls/UpdateHandler.java rename to GameServer/src/org/moparscape/msc/gs/phandler/ls/UpdateHandler.java index ebbf718..2ffc9e7 100644 --- a/GameServer/src/msc/gs/phandler/ls/UpdateHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/phandler/ls/UpdateHandler.java @@ -1,14 +1,14 @@ -package msc.gs.phandler.ls; +package org.moparscape.msc.gs.phandler.ls; import org.apache.mina.common.IoSession; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.connection.LSPacket; +import org.moparscape.msc.gs.connection.Packet; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.phandler.PacketHandler; +import org.moparscape.msc.gs.util.Logger; -import msc.gs.Instance; -import msc.gs.connection.LSPacket; -import msc.gs.connection.Packet; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.phandler.PacketHandler; -import msc.gs.util.Logger; public class UpdateHandler implements PacketHandler { /** diff --git a/GameServer/src/msc/gs/plugins/ai/KingBlackDragon.java b/GameServer/src/org/moparscape/msc/gs/plugins/ai/KingBlackDragon.java similarity index 85% rename from GameServer/src/msc/gs/plugins/ai/KingBlackDragon.java rename to GameServer/src/org/moparscape/msc/gs/plugins/ai/KingBlackDragon.java index d024f58..76150f0 100644 --- a/GameServer/src/msc/gs/plugins/ai/KingBlackDragon.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/ai/KingBlackDragon.java @@ -1,17 +1,18 @@ -package msc.gs.plugins.ai; +package org.moparscape.msc.gs.plugins.ai; import java.util.ArrayList; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.event.ObjectRemover; -import msc.gs.model.GameObject; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Projectile; -import msc.gs.model.mini.Damager; -import msc.gs.plugins.dependencies.NpcAI; -import msc.gs.plugins.dependencies.NpcScript; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ObjectRemover; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Projectile; +import org.moparscape.msc.gs.model.mini.Damager; +import org.moparscape.msc.gs.plugins.dependencies.NpcAI; +import org.moparscape.msc.gs.plugins.dependencies.NpcScript; + /** * KingBlackDragon intelligence class. @@ -106,7 +107,7 @@ public class KingBlackDragon extends NpcScript implements NpcAI { try { if (npc != null) { if (npc.getOpponent() != null && npc.getOpponent() instanceof Player) { - Instance.getDelayedEventHandler().add(new msc.gs.event.MiniEvent((Player) npc.getOpponent(), 2500, new Object[] { npc }) { + Instance.getDelayedEventHandler().add(new org.moparscape.msc.gs.event.MiniEvent((Player) npc.getOpponent(), 2500, new Object[] { npc }) { public void action() { Npc n = (Npc) super.args[0]; if (n != null || n.getHits() > 0) { @@ -121,7 +122,7 @@ public class KingBlackDragon extends NpcScript implements NpcAI { GameObject obj = new GameObject(dam.getPlayer().getLocation(), 1036, 0, 0); world.registerGameObject(obj); Instance.getDelayedEventHandler().add(new ObjectRemover(obj, 500)); - Instance.getDelayedEventHandler().add(new msc.gs.event.MiniEvent((Player) n.getOpponent(), 2500, new Object[] { n }) { + Instance.getDelayedEventHandler().add(new org.moparscape.msc.gs.event.MiniEvent((Player) n.getOpponent(), 2500, new Object[] { n }) { public void action() { shootFire((Npc) super.args[0]); } diff --git a/GameServer/src/msc/gs/plugins/ai/RedDragon.java b/GameServer/src/org/moparscape/msc/gs/plugins/ai/RedDragon.java similarity index 80% rename from GameServer/src/msc/gs/plugins/ai/RedDragon.java rename to GameServer/src/org/moparscape/msc/gs/plugins/ai/RedDragon.java index dc3e965..1e6a921 100644 --- a/GameServer/src/msc/gs/plugins/ai/RedDragon.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/ai/RedDragon.java @@ -1,19 +1,20 @@ -package msc.gs.plugins.ai; +package org.moparscape.msc.gs.plugins.ai; import java.util.ArrayList; -import msc.config.Constants; -import msc.gs.Instance; -import msc.gs.event.ObjectRemover; -import msc.gs.model.GameObject; -import msc.gs.model.Item; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Projectile; -import msc.gs.model.World; -import msc.gs.plugins.dependencies.NpcAI; -import msc.gs.plugins.dependencies.NpcScript; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ObjectRemover; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Projectile; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.plugins.dependencies.NpcAI; +import org.moparscape.msc.gs.plugins.dependencies.NpcScript; +import org.moparscape.msc.gs.tools.DataConversions; + /** * KingBlackDragon intelligence class. diff --git a/GameServer/src/msc/gs/plugins/dependencies/NpcAI.java b/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcAI.java similarity index 86% rename from GameServer/src/msc/gs/plugins/dependencies/NpcAI.java rename to GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcAI.java index 5883bce..42a472d 100644 --- a/GameServer/src/msc/gs/plugins/dependencies/NpcAI.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcAI.java @@ -1,7 +1,7 @@ -package msc.gs.plugins.dependencies; +package org.moparscape.msc.gs.plugins.dependencies; -import msc.gs.model.Npc; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; /** * Fires off all combat related events for NPCs. diff --git a/GameServer/src/msc/gs/plugins/dependencies/NpcScript.java b/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcScript.java similarity index 76% rename from GameServer/src/msc/gs/plugins/dependencies/NpcScript.java rename to GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcScript.java index a00fa00..19d13b3 100644 --- a/GameServer/src/msc/gs/plugins/dependencies/NpcScript.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/NpcScript.java @@ -1,12 +1,13 @@ -package msc.gs.plugins.dependencies; +package org.moparscape.msc.gs.plugins.dependencies; import java.util.ArrayList; -import msc.gs.model.ChatMessage; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Projectile; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Projectile; + public class NpcScript { diff --git a/GameServer/src/msc/gs/plugins/dependencies/PluginHandler.java b/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/PluginHandler.java similarity index 85% rename from GameServer/src/msc/gs/plugins/dependencies/PluginHandler.java rename to GameServer/src/org/moparscape/msc/gs/plugins/dependencies/PluginHandler.java index 6f79275..cd78000 100644 --- a/GameServer/src/msc/gs/plugins/dependencies/PluginHandler.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/dependencies/PluginHandler.java @@ -1,4 +1,4 @@ -package msc.gs.plugins.dependencies; +package org.moparscape.msc.gs.plugins.dependencies; import java.io.File; import java.io.IOException; @@ -7,10 +7,11 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import msc.gs.model.GameObject; -import msc.gs.model.Player; -import msc.gs.plugins.listeners.ObjectListener; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.plugins.listeners.ObjectListener; +import org.moparscape.msc.gs.util.Logger; + /** * Initiates plugins that implements some listeners @@ -86,9 +87,9 @@ public class PluginHandler { public void initPlugins() { try { try { - getClassesFromFileJarFile("msc.gs.plugins.plugs", System.getProperty("user.dir")); - getClassesFromFileJarFile("msc.gs.plugins.plugs.skills", System.getProperty("user.dir")); - getClassesFromFileJarFile("msc.gs.plugins.ai", System.getProperty("user.dir")); + getClassesFromFileJarFile("org.moparscape.msc.gs.plugins.plugs", System.getProperty("user.dir")); + getClassesFromFileJarFile("org.moparscape.msc.gs.plugins.plugs.skills", System.getProperty("user.dir")); + getClassesFromFileJarFile("org.moparscape.msc.gs.plugins.ai", System.getProperty("user.dir")); for (Class c : allClasses) { Object cl; cl = c.newInstance(); diff --git a/GameServer/src/msc/gs/plugins/extras/Quiz.java b/GameServer/src/org/moparscape/msc/gs/plugins/extras/Quiz.java similarity index 98% rename from GameServer/src/msc/gs/plugins/extras/Quiz.java rename to GameServer/src/org/moparscape/msc/gs/plugins/extras/Quiz.java index 7cbb424..89323f4 100644 --- a/GameServer/src/msc/gs/plugins/extras/Quiz.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/extras/Quiz.java @@ -1,4 +1,4 @@ -package msc.gs.plugins.extras; +package org.moparscape.msc.gs.plugins.extras; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -7,10 +7,11 @@ import java.util.Iterator; import javax.swing.Timer; -import msc.gs.Instance; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.util.Logger; + public class Quiz extends Thread { diff --git a/GameServer/src/msc/gs/plugins/extras/Thieving.java b/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java similarity index 96% rename from GameServer/src/msc/gs/plugins/extras/Thieving.java rename to GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java index 5a05812..2c3ee33 100644 --- a/GameServer/src/msc/gs/plugins/extras/Thieving.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/extras/Thieving.java @@ -1,25 +1,26 @@ -package msc.gs.plugins.extras; +package org.moparscape.msc.gs.plugins.extras; import java.util.ArrayList; import java.util.Random; -import msc.gs.Instance; -import msc.gs.event.FightEvent; -import msc.gs.event.MiniEvent; -import msc.gs.event.ShortEvent; -import msc.gs.event.WalkToMobEvent; -import msc.gs.external.GameObjectDef; -import msc.gs.model.ActiveTile; -import msc.gs.model.Bubble; -import msc.gs.model.ChatMessage; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.World; -import msc.gs.states.Action; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.FightEvent; +import org.moparscape.msc.gs.event.MiniEvent; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.event.WalkToMobEvent; +import org.moparscape.msc.gs.external.GameObjectDef; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.states.Action; +import org.moparscape.msc.gs.util.Logger; + /** * diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemListener.java b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemListener.java new file mode 100644 index 0000000..ed3c75c --- /dev/null +++ b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemListener.java @@ -0,0 +1,5 @@ +package org.moparscape.msc.gs.plugins.listeners; + +public class ItemListener { + +} diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnItemListener.java b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnItemListener.java new file mode 100644 index 0000000..ca952da --- /dev/null +++ b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnItemListener.java @@ -0,0 +1,5 @@ +package org.moparscape.msc.gs.plugins.listeners; + +public class ItemOnItemListener { + +} diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnObjectListener.java b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnObjectListener.java new file mode 100644 index 0000000..991022c --- /dev/null +++ b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ItemOnObjectListener.java @@ -0,0 +1,5 @@ +package org.moparscape.msc.gs.plugins.listeners; + +public class ItemOnObjectListener { + +} diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/listeners/NpcListener.java b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/NpcListener.java new file mode 100644 index 0000000..1958cad --- /dev/null +++ b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/NpcListener.java @@ -0,0 +1,5 @@ +package org.moparscape.msc.gs.plugins.listeners; + +public class NpcListener { + +} diff --git a/GameServer/src/msc/gs/plugins/listeners/ObjectListener.java b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ObjectListener.java similarity index 83% rename from GameServer/src/msc/gs/plugins/listeners/ObjectListener.java rename to GameServer/src/org/moparscape/msc/gs/plugins/listeners/ObjectListener.java index b59f4ef..55e2080 100644 --- a/GameServer/src/msc/gs/plugins/listeners/ObjectListener.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/listeners/ObjectListener.java @@ -1,7 +1,7 @@ -package msc.gs.plugins.listeners; +package org.moparscape.msc.gs.plugins.listeners; -import msc.gs.model.GameObject; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Player; /** * Used for Plugins. diff --git a/GameServer/src/msc/gs/plugins/plugs/Test.java b/GameServer/src/org/moparscape/msc/gs/plugins/plugs/Test.java similarity index 70% rename from GameServer/src/msc/gs/plugins/plugs/Test.java rename to GameServer/src/org/moparscape/msc/gs/plugins/plugs/Test.java index 05a504d..ecd0f79 100644 --- a/GameServer/src/msc/gs/plugins/plugs/Test.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/plugs/Test.java @@ -1,8 +1,8 @@ -package msc.gs.plugins.plugs; +package org.moparscape.msc.gs.plugins.plugs; -import msc.gs.model.GameObject; -import msc.gs.model.Player; -import msc.gs.plugins.listeners.ObjectListener; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.plugins.listeners.ObjectListener; /** * Testting some triggering. diff --git a/GameServer/src/msc/gs/plugins/plugs/skills/Mining.java b/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java similarity index 83% rename from GameServer/src/msc/gs/plugins/plugs/skills/Mining.java rename to GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java index 1c9ff59..aba9764 100644 --- a/GameServer/src/msc/gs/plugins/plugs/skills/Mining.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java @@ -1,18 +1,18 @@ -package msc.gs.plugins.plugs.skills; +package org.moparscape.msc.gs.plugins.plugs.skills; -import msc.config.Formulae; -import msc.gs.Instance; -import msc.gs.event.ShortEvent; -import msc.gs.event.SingleEvent; -import msc.gs.external.EntityHandler; -import msc.gs.external.ObjectMiningDef; -import msc.gs.model.ActiveTile; -import msc.gs.model.Bubble; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Player; -import msc.gs.plugins.listeners.ObjectListener; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Formulae; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.event.ShortEvent; +import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.external.ObjectMiningDef; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.Bubble; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.plugins.listeners.ObjectListener; +import org.moparscape.msc.gs.tools.DataConversions; public class Mining implements ObjectListener { diff --git a/GameServer/src/msc/gs/plugins/quests/CooksAssistant.java b/GameServer/src/org/moparscape/msc/gs/plugins/quests/CooksAssistant.java similarity index 95% rename from GameServer/src/msc/gs/plugins/quests/CooksAssistant.java rename to GameServer/src/org/moparscape/msc/gs/plugins/quests/CooksAssistant.java index 398ac10..a2a004e 100644 --- a/GameServer/src/msc/gs/plugins/quests/CooksAssistant.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/quests/CooksAssistant.java @@ -1,9 +1,9 @@ -package msc.gs.plugins.quests; +package org.moparscape.msc.gs.plugins.quests; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.quest.Quest; -import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.quest.QuestAction; /** * Quest: Cook's Assistant (v1.0) Status: COMPLETE Start: Lumbridge cook (id 7) diff --git a/GameServer/src/msc/gs/plugins/quests/Dorics.java b/GameServer/src/org/moparscape/msc/gs/plugins/quests/Dorics.java similarity index 95% rename from GameServer/src/msc/gs/plugins/quests/Dorics.java rename to GameServer/src/org/moparscape/msc/gs/plugins/quests/Dorics.java index d0cf785..f9831d6 100644 --- a/GameServer/src/msc/gs/plugins/quests/Dorics.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/quests/Dorics.java @@ -1,8 +1,8 @@ -package msc.gs.plugins.quests; +package org.moparscape.msc.gs.plugins.quests; -import msc.gs.quest.*; -import msc.gs.model.*; -import msc.gs.event.*; +import org.moparscape.msc.gs.event.*; +import org.moparscape.msc.gs.model.*; +import org.moparscape.msc.gs.quest.*; /** * Quest: Doric's Quest (v1.1) 4/5/2009 (uid: 7) Status: COMPLETE (untested) diff --git a/GameServer/src/msc/gs/plugins/quests/GoblinDiplomacy.java b/GameServer/src/org/moparscape/msc/gs/plugins/quests/GoblinDiplomacy.java similarity index 96% rename from GameServer/src/msc/gs/plugins/quests/GoblinDiplomacy.java rename to GameServer/src/org/moparscape/msc/gs/plugins/quests/GoblinDiplomacy.java index 700ec7c..416a0ea 100644 --- a/GameServer/src/msc/gs/plugins/quests/GoblinDiplomacy.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/quests/GoblinDiplomacy.java @@ -1,8 +1,8 @@ -package msc.gs.plugins.quests; +package org.moparscape.msc.gs.plugins.quests; -import msc.gs.quest.*; -import msc.gs.model.*; -import msc.gs.event.*; +import org.moparscape.msc.gs.event.*; +import org.moparscape.msc.gs.model.*; +import org.moparscape.msc.gs.quest.*; /** * Quest: Goblin Diplomacy (v1.0) 8/5/2009 (uid: 10) Status: COMPLETE (untested) diff --git a/GameServer/src/msc/gs/plugins/quests/ImpCatcher.java b/GameServer/src/org/moparscape/msc/gs/plugins/quests/ImpCatcher.java similarity index 97% rename from GameServer/src/msc/gs/plugins/quests/ImpCatcher.java rename to GameServer/src/org/moparscape/msc/gs/plugins/quests/ImpCatcher.java index e5b579c..3330dba 100644 --- a/GameServer/src/msc/gs/plugins/quests/ImpCatcher.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/quests/ImpCatcher.java @@ -1,11 +1,11 @@ -package msc.gs.plugins.quests; +package org.moparscape.msc.gs.plugins.quests; -import msc.gs.external.EntityHandler; -import msc.gs.model.InvItem; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.quest.Quest; -import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.external.EntityHandler; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.quest.QuestAction; /** * Quest: Imp Catcher (v1.0) 5/1/2009 Status: COMPLETE Start: Talborn the wizard diff --git a/GameServer/src/msc/gs/plugins/quests/KnightsSword.java b/GameServer/src/org/moparscape/msc/gs/plugins/quests/KnightsSword.java similarity index 94% rename from GameServer/src/msc/gs/plugins/quests/KnightsSword.java rename to GameServer/src/org/moparscape/msc/gs/plugins/quests/KnightsSword.java index c2626a6..2aacb7d 100644 --- a/GameServer/src/msc/gs/plugins/quests/KnightsSword.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/quests/KnightsSword.java @@ -1,14 +1,14 @@ -package msc.gs.plugins.quests; +package org.moparscape.msc.gs.plugins.quests; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Script; -import msc.gs.model.World; -import msc.gs.quest.Quest; -import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Script; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.quest.QuestAction; /** * Quest: The Knight's Sword (v1.0) 7/5/2009 Status: COMPLETE (untested) Start: @@ -166,7 +166,7 @@ public class KnightsSword extends Quest { * * final GameObject newobject = world.getTile(object.getX(), * object.getY()).getGameObject(); final ObjectMiningDef def = - * msc.gs.external.EntityHandler.getObjectMiningDef(102); + * org.moparscape.msc.gs.external.EntityHandler.getObjectMiningDef(102); * * final InvItem ore = new InvItem(BLUERITE_ORE_ID); if(!click) { * player.getActionSender().sendMessage("This rock contains Bluerite ore"); @@ -175,7 +175,7 @@ public class KnightsSword extends Quest { * if(player.getCurStat(14) < 15) {player.getActionSender().sendMessage( * "You need a mining level of 15 to mine this rock."); return; } * - * int axeId = -1; for(int id : msc.config.Formulae.miningAxeIDs) { + * int axeId = -1; for(int id : org.moparscape.msc.config.Formulae.miningAxeIDs) { * if(countItem(player, id) > 0) { axeId = id; break; } } * * if(axeId < 0) { @@ -207,7 +207,7 @@ public class KnightsSword extends Quest { * if(newobject2 != newobject) { player.setBusy(false); * player.setSkillLoops(0); return; } * - * if(msc.config.Formulae.getOre(def, player.getCurStat(14), axeID)) { + * if(org.moparscape.msc.config.Formulae.getOre(def, player.getCurStat(14), axeID)) { * giveItem(player, ore); * player.getActionSender().sendMessage("You manage to obtain some " + * ore.getDef().getName() + "."); player.setSkillLoops(0); player.incExp(14, diff --git a/GameServer/src/msc/gs/plugins/quests/SheepShearer.java b/GameServer/src/org/moparscape/msc/gs/plugins/quests/SheepShearer.java similarity index 94% rename from GameServer/src/msc/gs/plugins/quests/SheepShearer.java rename to GameServer/src/org/moparscape/msc/gs/plugins/quests/SheepShearer.java index 660cf1f..818dafa 100644 --- a/GameServer/src/msc/gs/plugins/quests/SheepShearer.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/quests/SheepShearer.java @@ -1,10 +1,10 @@ -package msc.gs.plugins.quests; +package org.moparscape.msc.gs.plugins.quests; -import msc.gs.model.InvItem; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.quest.Quest; -import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.quest.QuestAction; /** * Quest: Sheep Shearer (v1.0) Status: COMPLETE Start: Fred the farmer (id 77), diff --git a/GameServer/src/msc/gs/plugins/quests/WitchsPotion.java b/GameServer/src/org/moparscape/msc/gs/plugins/quests/WitchsPotion.java similarity index 93% rename from GameServer/src/msc/gs/plugins/quests/WitchsPotion.java rename to GameServer/src/org/moparscape/msc/gs/plugins/quests/WitchsPotion.java index 88b826b..d917713 100644 --- a/GameServer/src/msc/gs/plugins/quests/WitchsPotion.java +++ b/GameServer/src/org/moparscape/msc/gs/plugins/quests/WitchsPotion.java @@ -1,11 +1,11 @@ -package msc.gs.plugins.quests; +package org.moparscape.msc.gs.plugins.quests; -import msc.gs.model.GameObject; -import msc.gs.model.Item; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.quest.Quest; -import msc.gs.quest.QuestAction; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.quest.Quest; +import org.moparscape.msc.gs.quest.QuestAction; /** * Quest: Witch's Potion (v1.0) 7/5/2009 (uid: 9) Status: COMPLETE (untested) diff --git a/GameServer/src/msc/gs/quest/Quest.java b/GameServer/src/org/moparscape/msc/gs/quest/Quest.java similarity index 91% rename from GameServer/src/msc/gs/quest/Quest.java rename to GameServer/src/org/moparscape/msc/gs/quest/Quest.java index e4287c2..507b53d 100644 --- a/GameServer/src/msc/gs/quest/Quest.java +++ b/GameServer/src/org/moparscape/msc/gs/quest/Quest.java @@ -1,21 +1,22 @@ -package msc.gs.quest; +package org.moparscape.msc.gs.quest; import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import msc.gs.event.SingleEvent; -import msc.gs.model.ActiveTile; -import msc.gs.model.ChatMessage; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.MenuHandler; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.model.Point; -import msc.gs.model.World; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.event.SingleEvent; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.ChatMessage; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.MenuHandler; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.model.World; +import org.moparscape.msc.gs.util.Logger; + /** * Defines a quest script diff --git a/GameServer/src/msc/gs/quest/QuestAction.java b/GameServer/src/org/moparscape/msc/gs/quest/QuestAction.java similarity index 92% rename from GameServer/src/msc/gs/quest/QuestAction.java rename to GameServer/src/org/moparscape/msc/gs/quest/QuestAction.java index 4f2207e..b9d96ab 100644 --- a/GameServer/src/msc/gs/quest/QuestAction.java +++ b/GameServer/src/org/moparscape/msc/gs/quest/QuestAction.java @@ -1,4 +1,4 @@ -package msc.gs.quest; +package org.moparscape.msc.gs.quest; /** * Handles the list of possible quest triggers diff --git a/GameServer/src/msc/gs/quest/QuestEvent.java b/GameServer/src/org/moparscape/msc/gs/quest/QuestEvent.java similarity index 89% rename from GameServer/src/msc/gs/quest/QuestEvent.java rename to GameServer/src/org/moparscape/msc/gs/quest/QuestEvent.java index acb9547..002e18e 100644 --- a/GameServer/src/msc/gs/quest/QuestEvent.java +++ b/GameServer/src/org/moparscape/msc/gs/quest/QuestEvent.java @@ -1,7 +1,7 @@ -package msc.gs.quest; +package org.moparscape.msc.gs.quest; -import msc.gs.event.DelayedEvent; -import msc.gs.model.Player; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.model.Player; /** * Version: 17/5/2009 diff --git a/GameServer/src/msc/gs/quest/QuestEventManager.java b/GameServer/src/org/moparscape/msc/gs/quest/QuestEventManager.java similarity index 89% rename from GameServer/src/msc/gs/quest/QuestEventManager.java rename to GameServer/src/org/moparscape/msc/gs/quest/QuestEventManager.java index 9a39d2c..fe519c2 100644 --- a/GameServer/src/msc/gs/quest/QuestEventManager.java +++ b/GameServer/src/org/moparscape/msc/gs/quest/QuestEventManager.java @@ -1,11 +1,12 @@ -package msc.gs.quest; +package org.moparscape.msc.gs.quest; import java.util.Iterator; import java.util.Vector; -import msc.gs.event.DelayedEvent; -import msc.gs.model.Player; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.event.DelayedEvent; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.util.Logger; + /** * Version: 17/5/2009 diff --git a/GameServer/src/msc/gs/quest/QuestManager.java b/GameServer/src/org/moparscape/msc/gs/quest/QuestManager.java similarity index 90% rename from GameServer/src/msc/gs/quest/QuestManager.java rename to GameServer/src/org/moparscape/msc/gs/quest/QuestManager.java index e7f49c7..c133663 100644 --- a/GameServer/src/msc/gs/quest/QuestManager.java +++ b/GameServer/src/org/moparscape/msc/gs/quest/QuestManager.java @@ -1,4 +1,4 @@ -package msc.gs.quest; +package org.moparscape.msc.gs.quest; import java.io.File; import java.io.FilenameFilter; @@ -9,14 +9,15 @@ import java.util.Vector; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import msc.config.Config; -import msc.gs.model.GameObject; -import msc.gs.model.InvItem; -import msc.gs.model.Item; -import msc.gs.model.Mob; -import msc.gs.model.Npc; -import msc.gs.model.Player; -import msc.gs.util.Logger; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.gs.model.GameObject; +import org.moparscape.msc.gs.model.InvItem; +import org.moparscape.msc.gs.model.Item; +import org.moparscape.msc.gs.model.Mob; +import org.moparscape.msc.gs.model.Npc; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.util.Logger; + /** * Manages the loading and execution of quests TODO: add quest error handling? @@ -112,7 +113,7 @@ public class QuestManager { questIds.clear(); /* - * File questDir = new File("src/msc/gs/plugins/quests/"); + * File questDir = new File("src/org.moparscape.msc/gs/plugins/quests/"); * * if(questDir == null || !questDir.exists()) throw new * Exception("Quests directory " + questDir.getAbsolutePath() + @@ -124,7 +125,7 @@ public class QuestManager { * @Override public boolean accept(File dir, String name) { return * name.endsWith(".class") && name.indexOf("$") <= -1; } }); */ - getClassesFromFileJarFile("msc.gs.plugins.quests", System.getProperty("user.dir")); + getClassesFromFileJarFile("org.moparscape.msc.gs.plugins.quests", System.getProperty("user.dir")); quests = new Vector(questz.size()); questIds = new Vector(questz.size()); int questCount = 0; diff --git a/GameServer/src/msc/gs/states/Action.java b/GameServer/src/org/moparscape/msc/gs/states/Action.java similarity index 94% rename from GameServer/src/msc/gs/states/Action.java rename to GameServer/src/org/moparscape/msc/gs/states/Action.java index 0e1e589..f5dc13d 100644 --- a/GameServer/src/msc/gs/states/Action.java +++ b/GameServer/src/org/moparscape/msc/gs/states/Action.java @@ -1,4 +1,4 @@ -package msc.gs.states; +package org.moparscape.msc.gs.states; public enum Action { diff --git a/GameServer/src/msc/gs/states/CombatState.java b/GameServer/src/org/moparscape/msc/gs/states/CombatState.java similarity index 79% rename from GameServer/src/msc/gs/states/CombatState.java rename to GameServer/src/org/moparscape/msc/gs/states/CombatState.java index dd1fcf7..8dd9925 100644 --- a/GameServer/src/msc/gs/states/CombatState.java +++ b/GameServer/src/org/moparscape/msc/gs/states/CombatState.java @@ -1,4 +1,4 @@ -package msc.gs.states; +package org.moparscape.msc.gs.states; public enum CombatState { diff --git a/GameServer/src/msc/gs/tools/Captcha.java b/GameServer/src/org/moparscape/msc/gs/tools/Captcha.java similarity index 97% rename from GameServer/src/msc/gs/tools/Captcha.java rename to GameServer/src/org/moparscape/msc/gs/tools/Captcha.java index 6a74136..b3d640d 100644 --- a/GameServer/src/msc/gs/tools/Captcha.java +++ b/GameServer/src/org/moparscape/msc/gs/tools/Captcha.java @@ -1,4 +1,4 @@ -package msc.gs.tools; +package org.moparscape.msc.gs.tools; import java.awt.Color; import java.awt.Font; @@ -14,8 +14,9 @@ import java.util.ArrayList; import java.util.Random; import javax.imageio.ImageIO; -import msc.gs.model.Player; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.util.Logger; + public class Captcha { /* diff --git a/GameServer/src/msc/gs/tools/DataConversions.java b/GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java similarity index 94% rename from GameServer/src/msc/gs/tools/DataConversions.java rename to GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java index 586fd05..34213f7 100644 --- a/GameServer/src/msc/gs/tools/DataConversions.java +++ b/GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java @@ -1,4 +1,4 @@ -package msc.gs.tools; +package org.moparscape.msc.gs.tools; import java.io.BufferedInputStream; import java.io.IOException; @@ -9,9 +9,10 @@ import java.security.MessageDigest; import java.text.SimpleDateFormat; import java.util.Random; -import msc.gs.connection.RSCPacket; -import msc.gs.model.Point; -import msc.gs.util.Logger; +import org.moparscape.msc.gs.connection.RSCPacket; +import org.moparscape.msc.gs.model.Point; +import org.moparscape.msc.gs.util.Logger; + import com.bombaydigital.vault.HexString; diff --git a/GameServer/src/msc/gs/tools/PaintCaptcha.java b/GameServer/src/org/moparscape/msc/gs/tools/PaintCaptcha.java similarity index 99% rename from GameServer/src/msc/gs/tools/PaintCaptcha.java rename to GameServer/src/org/moparscape/msc/gs/tools/PaintCaptcha.java index 670067c..81494e3 100644 --- a/GameServer/src/msc/gs/tools/PaintCaptcha.java +++ b/GameServer/src/org/moparscape/msc/gs/tools/PaintCaptcha.java @@ -1,4 +1,4 @@ -package msc.gs.tools; +package org.moparscape.msc.gs.tools; import java.awt.Color; import java.awt.Graphics; diff --git a/GameServer/src/msc/gs/util/DefCompressor.java b/GameServer/src/org/moparscape/msc/gs/util/DefCompressor.java similarity index 97% rename from GameServer/src/msc/gs/util/DefCompressor.java rename to GameServer/src/org/moparscape/msc/gs/util/DefCompressor.java index fa42bd7..77a9a1b 100644 --- a/GameServer/src/msc/gs/util/DefCompressor.java +++ b/GameServer/src/org/moparscape/msc/gs/util/DefCompressor.java @@ -1,4 +1,4 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.io.File; import java.io.FileInputStream; diff --git a/GameServer/src/msc/gs/util/DelayMonitor.java b/GameServer/src/org/moparscape/msc/gs/util/DelayMonitor.java similarity index 95% rename from GameServer/src/msc/gs/util/DelayMonitor.java rename to GameServer/src/org/moparscape/msc/gs/util/DelayMonitor.java index 753a321..f054ed6 100644 --- a/GameServer/src/msc/gs/util/DelayMonitor.java +++ b/GameServer/src/org/moparscape/msc/gs/util/DelayMonitor.java @@ -1,4 +1,4 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.text.DecimalFormat; diff --git a/GameServer/src/msc/gs/util/DuelLog.java b/GameServer/src/org/moparscape/msc/gs/util/DuelLog.java similarity index 68% rename from GameServer/src/msc/gs/util/DuelLog.java rename to GameServer/src/org/moparscape/msc/gs/util/DuelLog.java index 8327d86..e18f198 100644 --- a/GameServer/src/msc/gs/util/DuelLog.java +++ b/GameServer/src/org/moparscape/msc/gs/util/DuelLog.java @@ -1,8 +1,8 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; -import msc.gs.Instance; -import msc.gs.builders.ls.MiscPacketBuilder; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.builders.ls.MiscPacketBuilder; +import org.moparscape.msc.gs.model.World; public class DuelLog { public static final World world = Instance.getWorld(); diff --git a/GameServer/src/msc/gs/util/EntityList.java b/GameServer/src/org/moparscape/msc/gs/util/EntityList.java similarity index 91% rename from GameServer/src/msc/gs/util/EntityList.java rename to GameServer/src/org/moparscape/msc/gs/util/EntityList.java index cfffc61..b69d0c7 100644 --- a/GameServer/src/msc/gs/util/EntityList.java +++ b/GameServer/src/org/moparscape/msc/gs/util/EntityList.java @@ -1,11 +1,12 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.util.AbstractCollection; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import msc.gs.model.Entity; +import org.moparscape.msc.gs.model.Entity; + public class EntityList extends AbstractCollection { /** diff --git a/GameServer/src/msc/gs/util/EntityListIterator.java b/GameServer/src/org/moparscape/msc/gs/util/EntityListIterator.java similarity index 86% rename from GameServer/src/msc/gs/util/EntityListIterator.java rename to GameServer/src/org/moparscape/msc/gs/util/EntityListIterator.java index 7ec1d49..1d8a9cd 100644 --- a/GameServer/src/msc/gs/util/EntityListIterator.java +++ b/GameServer/src/org/moparscape/msc/gs/util/EntityListIterator.java @@ -1,9 +1,10 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.util.Iterator; import java.util.Set; -import msc.gs.model.Entity; +import org.moparscape.msc.gs.model.Entity; + public class EntityListIterator implements Iterator { private int curIndex = 0; diff --git a/GameServer/src/msc/gs/util/Logger.java b/GameServer/src/org/moparscape/msc/gs/util/Logger.java similarity index 94% rename from GameServer/src/msc/gs/util/Logger.java rename to GameServer/src/org/moparscape/msc/gs/util/Logger.java index e6580a2..c3dd6ae 100644 --- a/GameServer/src/msc/gs/util/Logger.java +++ b/GameServer/src/org/moparscape/msc/gs/util/Logger.java @@ -1,10 +1,11 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.text.SimpleDateFormat; import java.util.Date; -import msc.gs.Instance; -import msc.gs.model.World; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.model.World; + public class Logger { /** diff --git a/GameServer/src/msc/gs/util/MapGenerator.java b/GameServer/src/org/moparscape/msc/gs/util/MapGenerator.java similarity index 90% rename from GameServer/src/msc/gs/util/MapGenerator.java rename to GameServer/src/org/moparscape/msc/gs/util/MapGenerator.java index ae1f50c..c772832 100644 --- a/GameServer/src/msc/gs/util/MapGenerator.java +++ b/GameServer/src/org/moparscape/msc/gs/util/MapGenerator.java @@ -1,4 +1,4 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.awt.Color; import java.awt.Graphics; @@ -7,11 +7,12 @@ import java.io.File; import javax.imageio.ImageIO; -import msc.config.Config; -import msc.gs.Instance; -import msc.gs.model.ActiveTile; -import msc.gs.model.TileValue; -import msc.gs.model.World; +import org.moparscape.msc.config.Config; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.model.ActiveTile; +import org.moparscape.msc.gs.model.TileValue; +import org.moparscape.msc.gs.model.World; + public class MapGenerator { private static final int BLACK = new Color(0, 0, 0).getRGB(); diff --git a/GameServer/src/msc/gs/util/ObjectLoader.java b/GameServer/src/org/moparscape/msc/gs/util/ObjectLoader.java similarity index 83% rename from GameServer/src/msc/gs/util/ObjectLoader.java rename to GameServer/src/org/moparscape/msc/gs/util/ObjectLoader.java index 313a433..8a9789b 100644 --- a/GameServer/src/msc/gs/util/ObjectLoader.java +++ b/GameServer/src/org/moparscape/msc/gs/util/ObjectLoader.java @@ -1,11 +1,12 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.io.File; import java.io.FileInputStream; import java.io.ObjectInputStream; import java.util.zip.GZIPInputStream; -import msc.config.Config; +import org.moparscape.msc.config.Config; + public class ObjectLoader { public static Object loadObject(String file) { diff --git a/GameServer/src/msc/gs/util/PersistenceManager.java b/GameServer/src/org/moparscape/msc/gs/util/PersistenceManager.java similarity index 91% rename from GameServer/src/msc/gs/util/PersistenceManager.java rename to GameServer/src/org/moparscape/msc/gs/util/PersistenceManager.java index a0a3f16..6ddcbb2 100644 --- a/GameServer/src/msc/gs/util/PersistenceManager.java +++ b/GameServer/src/org/moparscape/msc/gs/util/PersistenceManager.java @@ -1,4 +1,4 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.io.File; import java.io.FileInputStream; @@ -11,7 +11,8 @@ import java.util.Properties; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import msc.config.Config; +import org.moparscape.msc.config.Config; + import com.thoughtworks.xstream.XStream; diff --git a/GameServer/src/org/moparscape/msc/gs/util/Processor.java b/GameServer/src/org/moparscape/msc/gs/util/Processor.java new file mode 100644 index 0000000..23a1268 --- /dev/null +++ b/GameServer/src/org/moparscape/msc/gs/util/Processor.java @@ -0,0 +1,7 @@ +package org.moparscape.msc.gs.util; + +import org.moparscape.msc.gs.model.Player; + +public interface Processor { + public void process(Player p); +} diff --git a/GameServer/src/msc/gs/util/RSA.java b/GameServer/src/org/moparscape/msc/gs/util/RSA.java similarity index 97% rename from GameServer/src/msc/gs/util/RSA.java rename to GameServer/src/org/moparscape/msc/gs/util/RSA.java index 84575b7..5faaef7 100644 --- a/GameServer/src/msc/gs/util/RSA.java +++ b/GameServer/src/org/moparscape/msc/gs/util/RSA.java @@ -1,4 +1,4 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; /************************************************************************* * Compilation: javac RSA.java diff --git a/GameServer/src/msc/gs/util/StatefulEntityCollection.java b/GameServer/src/org/moparscape/msc/gs/util/StatefulEntityCollection.java similarity index 92% rename from GameServer/src/msc/gs/util/StatefulEntityCollection.java rename to GameServer/src/org/moparscape/msc/gs/util/StatefulEntityCollection.java index b746e0a..360348d 100644 --- a/GameServer/src/msc/gs/util/StatefulEntityCollection.java +++ b/GameServer/src/org/moparscape/msc/gs/util/StatefulEntityCollection.java @@ -1,10 +1,11 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import msc.gs.model.Entity; +import org.moparscape.msc.gs.model.Entity; + /** * This class is a collection which is backed by 3 seperate Sets. diff --git a/GameServer/src/msc/gs/util/WorkGroup.java b/GameServer/src/org/moparscape/msc/gs/util/WorkGroup.java similarity index 93% rename from GameServer/src/msc/gs/util/WorkGroup.java rename to GameServer/src/org/moparscape/msc/gs/util/WorkGroup.java index 42cf7a5..75903f3 100644 --- a/GameServer/src/msc/gs/util/WorkGroup.java +++ b/GameServer/src/org/moparscape/msc/gs/util/WorkGroup.java @@ -1,4 +1,4 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.util.ArrayList; import java.util.Collection; @@ -6,8 +6,9 @@ import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import msc.gs.core.ClientUpdater; -import msc.gs.model.Player; +import org.moparscape.msc.gs.core.ClientUpdater; +import org.moparscape.msc.gs.model.Player; + /** * This class manages a set of Workers. diff --git a/GameServer/src/msc/gs/util/Worker.java b/GameServer/src/org/moparscape/msc/gs/util/Worker.java similarity index 92% rename from GameServer/src/msc/gs/util/Worker.java rename to GameServer/src/org/moparscape/msc/gs/util/Worker.java index 1e99caf..f812e52 100644 --- a/GameServer/src/msc/gs/util/Worker.java +++ b/GameServer/src/org/moparscape/msc/gs/util/Worker.java @@ -1,8 +1,9 @@ -package msc.gs.util; +package org.moparscape.msc.gs.util; import java.util.concurrent.*; -import msc.gs.model.Player; +import org.moparscape.msc.gs.model.Player; + /** * The Worker class is a runnable class that can be used for splitting up a diff --git a/GameServer/src/msc/irc/CommandHandler.java b/GameServer/src/org/moparscape/msc/irc/CommandHandler.java similarity index 85% rename from GameServer/src/msc/irc/CommandHandler.java rename to GameServer/src/org/moparscape/msc/irc/CommandHandler.java index 138e32c..20802c2 100644 --- a/GameServer/src/msc/irc/CommandHandler.java +++ b/GameServer/src/org/moparscape/msc/irc/CommandHandler.java @@ -1,15 +1,16 @@ -package msc.irc; +package org.moparscape.msc.irc; -import static msc.irc.IRC.IRCTools.bold; -import static msc.irc.IRC.IRCTools.getColor; +import static org.moparscape.msc.irc.IRC.IRCTools.bold; +import static org.moparscape.msc.irc.IRC.IRCTools.getColor; import java.io.IOException; -import msc.config.Constants; -import msc.gs.Instance; -import msc.gs.model.Player; -import msc.gs.phandler.PlayerLogin; -import msc.gs.tools.DataConversions; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.gs.Instance; +import org.moparscape.msc.gs.model.Player; +import org.moparscape.msc.gs.phandler.PlayerLogin; +import org.moparscape.msc.gs.tools.DataConversions; + /** * Self explanatory, handles incoming commands. diff --git a/GameServer/src/msc/irc/IRC.java b/GameServer/src/org/moparscape/msc/irc/IRC.java similarity index 94% rename from GameServer/src/msc/irc/IRC.java rename to GameServer/src/org/moparscape/msc/irc/IRC.java index d1e8b1b..82c2046 100644 --- a/GameServer/src/msc/irc/IRC.java +++ b/GameServer/src/org/moparscape/msc/irc/IRC.java @@ -1,13 +1,13 @@ -package msc.irc; +package org.moparscape.msc.irc; import java.io.IOException; import org.jibble.pircbot.IrcException; import org.jibble.pircbot.NickAlreadyInUseException; import org.jibble.pircbot.PircBot; +import org.moparscape.msc.config.Constants; +import org.moparscape.msc.gs.util.Logger; -import msc.config.Constants; -import msc.gs.util.Logger; /** * GameServer <> IRC Integration. Using PircBot v1.46 IRC Framework. diff --git a/GameServer/world.xml b/GameServer/world.xml index 07afb28..7d0f3e6 100644 --- a/GameServer/world.xml +++ b/GameServer/world.xml @@ -1,7 +1,7 @@ - RSCD Config + MoparClassic Config 39 localhost 43595 @@ -11,9 +11,8 @@ 1 localhost 34526 - root + mc localhost - rscangel - + moparclassic diff --git a/LoginServer/build.xml b/LoginServer/build.xml index a2e74a8..fb98b37 100644 --- a/LoginServer/build.xml +++ b/LoginServer/build.xml @@ -1,36 +1,36 @@ - - + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - + + + @@ -46,5 +46,5 @@ - + diff --git a/LoginServer/conf/ls/FPacketHandlers.xml b/LoginServer/conf/ls/FPacketHandlers.xml index f8ca060..c25d954 100644 --- a/LoginServer/conf/ls/FPacketHandlers.xml +++ b/LoginServer/conf/ls/FPacketHandlers.xml @@ -3,36 +3,36 @@ 1 - rsca.ls.packethandler.frontend.Logout + org.moparscape.msc.ls.packethandler.frontend.Logout 2 - rsca.ls.packethandler.frontend.Shutdown + org.moparscape.msc.ls.packethandler.frontend.Shutdown 3 - rsca.ls.packethandler.frontend.Update + org.moparscape.msc.ls.packethandler.frontend.Update 5 - rsca.ls.packethandler.frontend.Global + org.moparscape.msc.ls.packethandler.frontend.Global 6 - rsca.ls.packethandler.frontend.Alert + org.moparscape.msc.ls.packethandler.frontend.Alert 7 - rsca.ls.packethandler.frontend.ListPlayers + org.moparscape.msc.ls.packethandler.frontend.ListPlayers \ No newline at end of file diff --git a/LoginServer/conf/ls/LSPacketHandlers.xml b/LoginServer/conf/ls/LSPacketHandlers.xml index 6648bc4..9c9e6be 100644 --- a/LoginServer/conf/ls/LSPacketHandlers.xml +++ b/LoginServer/conf/ls/LSPacketHandlers.xml @@ -4,44 +4,44 @@ 1 2 - rsca.ls.packethandler.loginserver.RegisterWorld + org.moparscape.msc.ls.packethandler.loginserver.RegisterWorld 3 - rsca.ls.packethandler.loginserver.KillHandler + org.moparscape.msc.ls.packethandler.loginserver.KillHandler 4 5 - rsca.ls.packethandler.loginserver.BanHandler + org.moparscape.msc.ls.packethandler.loginserver.BanHandler 6 - rsca.ls.packethandler.loginserver.PrivacySettingHandler + org.moparscape.msc.ls.packethandler.loginserver.PrivacySettingHandler 7 - rsca.ls.packethandler.loginserver.GameSettingHandler + org.moparscape.msc.ls.packethandler.loginserver.GameSettingHandler 8 - rsca.ls.packethandler.loginserver.PlayerInfoRequestHandler + org.moparscape.msc.ls.packethandler.loginserver.PlayerInfoRequestHandler 9 - rsca.ls.packethandler.loginserver.SaveProfilesRequestHandler + org.moparscape.msc.ls.packethandler.loginserver.SaveProfilesRequestHandler @@ -51,42 +51,42 @@ 13 14 - rsca.ls.packethandler.loginserver.FriendHandler + org.moparscape.msc.ls.packethandler.loginserver.FriendHandler 15 - rsca.ls.packethandler.loginserver.ReportHandler + org.moparscape.msc.ls.packethandler.loginserver.ReportHandler 20 - rsca.ls.packethandler.loginserver.PlayerSaveHandler + org.moparscape.msc.ls.packethandler.loginserver.PlayerSaveHandler 30 - rsca.ls.packethandler.loginserver.PlayerLogoutHandler + org.moparscape.msc.ls.packethandler.loginserver.PlayerLogoutHandler 31 - rsca.ls.packethandler.loginserver.PlayerLoginHandler + org.moparscape.msc.ls.packethandler.loginserver.PlayerLoginHandler 32 - rsca.ls.packethandler.loginserver.LogHandler + org.moparscape.msc.ls.packethandler.loginserver.LogHandler 33 - rsca.ls.packethandler.loginserver.Tradelog + org.moparscape.msc.ls.packethandler.loginserver.Tradelog diff --git a/LoginServer/conf/ls/aliases.xml b/LoginServer/conf/ls/aliases.xml index 9fc2cd9..4738810 100644 --- a/LoginServer/conf/ls/aliases.xml +++ b/LoginServer/conf/ls/aliases.xml @@ -3,5 +3,5 @@ Stores aliases for the XStream engine - rsca.ls.packethandler.PacketHandlerDef + org.moparscape.msc.ls.packethandler.PacketHandlerDef diff --git a/LoginServer/ls.conf b/LoginServer/ls.conf index 5bb54a8..b23e239 100644 --- a/LoginServer/ls.conf +++ b/LoginServer/ls.conf @@ -3,8 +3,8 @@ RSCD-LS Config localhost - rscangel - root + moparclassic + mc localhost 34526 diff --git a/LoginServer/ls.jar b/LoginServer/ls.jar index a62296cf3539f02b0445c53c65db82a9a71a4333..b3e140c6b96a26d3685b21b15c26b369629e686c 100644 GIT binary patch delta 3003 zcmZuy4NzRw6@KR}8~%0^kVV+tgbhE7WZ7le9}@m|%_Plqpcd2VB$}a-fhd|(YA`k= zF;l{1CIPC!8@Y{=m1qWHqO-(hf|$QjD;gCw#!M;(?Pvp2+LWk6X;Ond@7$;OVwqX) zedm1lJKs6?o_lZZ(to>4Z>*}&Ma4ZFR*zj*YZqj}ObZFrO!oXP%O6@cxQ6U2 zb>xa&Vim4CTsGnQY2N)}@{0R6Vq*8SS_%A0Wwi)#+uA?r$#SXsqTmVFoRG;@4I zoGsD08?)}mkUZrv3{$t0Q5Vp={lNv1<{V}|_3>HNCCXa~Iv~KzV zQPekP21VhUXP>6YfLRac#Oz8u)Klz%ssxxvWf-_835>$_UTfyBA^y~v-bbOz{MZWg+&zgATEP@_#h7Sz0nC)xdqsHNaY467|8gIVjNJ6**xF^ zDj6r_46sDmV$@0rEAU*I9S^1Rs~V1anRSfYdASSdQ1eO`MnA&qU9fPmvfriM*EWYS z>82D(GOM?dG8}HcAhWBom7jH~lHOBR4)RGCWRk>$Jp4Yxoq3Q?-|O*P?zFHzOE#Z$ ztBZ~+#-I(2WWZcFam?#D<<5>9)~xw~=Ykvk`aZ7U-qiT zDl|eh-{b{9W&Oyyi|t!vNxF<3ZqdZ7@Spj>NlER% zZ+U799oXYOSWL`c)h6!qqR>9vu3QaskYDowJuTej$CW3yD=XR6?Pgw8pz3T@9Q7^e z$Wm@&alpP*jE7s%Xs7$5qyW-M!1@Aov~?1?y8yDNQd9ficyR%yCSz(VGy?8BpdeZ3 zK*n6aqNPZ2{#k4#GjCW5X~ervG5)3NJEMVrxD=AfGpTrZ2>Z+Fy!9X$jsDC(VCMVr zGW2NzKm9x|$Y8Ja#PjxLU?Q1GYm4?ypu}?QIgbXtvqwcI{wPG~&91k`FvP1ELR;Ma zW7PA(LP#Z{>k3imXqY|H?_`VnV)#piYK2cKjy3)0@bb7K)o3n4W9c9oGx*vfNFjws zd;NxAqQbp+y0iy@Vk|F`zk;{$jIwizVJt644$v-FWH zRz93Sr&B-Z#tITwIQgUns&6pEI$&2 z9FqC_s>+2qcn|&uw<|-VU@xBvs;|MvTfDnxQKkpmM*A9k$pd#n;XJPcFLLRB>Fp}a delta 2900 zcmaJ?c~FyA5dSt1R7em71&Nw)M2-+h2qKpu*s5ba&_5ipN~al6t9UEc+flR?Jc|94 z2NlurqGCHrK_iM5>YyTn*I-9!wT{+$kF_0&iemTM7s1cY)EWFXyTASI@9o?7-kUYb z*K3sOu_Ikv-3962!sNm&>ddDoU1vy`x&PAfVA0&N5PY82<`*_cq zlR0H(lngCSg%FD8gPFeB3axl4ub1jwiDEuz#ajoviUx%{f#MViPViv*9#Mo!--=s` zI|QgWqgHs3r@`+kkg>lgLDzZcw0@`yg*?JEJQQZs^3cf0sobcHn#+w4 zbDoC4m7~&m37@o|l;pXdewFi-+m9;9Gb8gcC!9FFjC8oN*^cEM@xd6hke8>1I5 z=IQ5_m2pgVPCPft^M2>G3Jb1q@T{WQ+_<^jl?%IDT+NNWC2cM}up3sjIwq*lMG&@j z5d@34rM-_hx2l_XV!x{5=I%0HYQugD*Is)t$k~-cOSzF*d7B#}s$O&Oh?6_G=Rs`% zH`Hfbxj>)BQ{1@PG@TQsG|zWYODbNn%ohc&g0M$?cBmiIC4#Er!HvT_zxeiDPQCVz zTilrT@Nd3@=`GXv0?)QqxlzY*+P9J6&?upvTlYNRGgnWk%CgL?J4Y3QFh?nB8$(%1 zGI%=*y`Y9T9Fx33O%)wkzOaKTIXpD5p8E>4Foi@r+JnJH7E1|-xXxq2)`Ua6B!Zm^ z2aVrRJUR0hWY}?(LE+=lag^9IjKX!MHh}LWNfn(j=YO6ZKfHt|DR16V%v=zafyW}_ zeXjq>HLz6%=tpvP8nEC5b^<^2dsYN!6stk3$@62L5uhSxyW~6~IrYqD1ezp9$QBUG zcl&jJe;MUcLYM+$0qm)aWvYUili(eiF-8=ypUp5rU#gXhzZI7i;!}m@9onwaMZ+#h zSOo3|Tm9LkNa!Or_^a9DC{R&) zt2%368V;6cH$e!NrCZs>NU#v7WYG|HG1kb(8i6vjG0V+2^(91xT zY+e+^=p?npnWMD7AjrS#`=D2$qJLNj2_wmEQMgWj=4%22(dVsPdC`O#8u3pfqfcUX z6NFRJW)mjuV`U}?p`-}Cy?z{`zfBQ@{<0)L_NNJql%z9LQj!@$DM@GkEj33e2x^b_ zTcTt+X0T9F6(%Xpr;GQ~2e4OW=ZttnqjR@itg&kho#R0JW{v&)!s73+(dTi{c(t5fWIQpU#9mXRvXP90ro_y(wfD_TEK_(w?I!yZPTy4u>n&9QF%XE zY6wfUKm@5?X~EPd*)-V|7SPe2{FTuoKN|PsFm9YdmT6r~NRJo@p!BF1Os`rdImM^T z`Y>ILbKx7Mz|4hm zdMWTp5e0S?1$G7!V=-`XyL9H*+*r`k8t$5hKg!0*_zF7^A*=Os@mr*tHN`?Ns`^;s z*j9p(KxP;Oy{Ut;n_k8tvQG!W5CVCp#pm9`-Lc{}nq{EntacFC2vl;m_}mTb=rMdV zEeK%U6vk)8m=9p`(b+=Xi3;f$vM7~oNaN=`$-dz&V(v*PK*aXs!>)NqZ*Gw za`7Y?WkM2Iemo=*-9;(0xt2233E)S)YRjlz;lRCKsuF}~S!R13vwK0XXglLYLrw5r z`&)<4#)UNF-8)bQS2hxy)h9UBKT5!IXPUS-A`ya#AbwDVMlptw+966g5P~w~3jOU>t#VYI{ViLr^7xY%)+b+m!^V zr0k!XEfY#`Bj@`FLV^sG_E5T_!^K?>dv+f0j|b!O#bN+R`@VLx<8Gj8&~(n zUB8LT8YC-p%>%@7%|X(mt!BfL!G{JQJsID$54<`;e9CGh?(u z6MVswt+F`}`DP5kD^_N6-jkcgj_MnVd-@zVD^RB8OZLp>d=;)|N3Ux~!RG&5drw(P N3dFgY!tvM&{{rdlJzxL; diff --git a/LoginServer/src/.svn/entries b/LoginServer/src/.svn/entries index d85d76d..2c1d38e 100644 --- a/LoginServer/src/.svn/entries +++ b/LoginServer/src/.svn/entries @@ -26,6 +26,6 @@ svn:special svn:externals svn:needs-lock 148ed574-2c31-4338-a85f-4a89e8d7a751 -rsca +org.moparscape.msc dir diff --git a/LoginServer/src/rsca/ls/LoginEngine.java b/LoginServer/src/org/moparscape/msc/ls/LoginEngine.java similarity index 88% rename from LoginServer/src/rsca/ls/LoginEngine.java rename to LoginServer/src/org/moparscape/msc/ls/LoginEngine.java index 3987100..a6ffacc 100644 --- a/LoginServer/src/rsca/ls/LoginEngine.java +++ b/LoginServer/src/org/moparscape/msc/ls/LoginEngine.java @@ -1,15 +1,16 @@ -package rsca.ls; +package org.moparscape.msc.ls; import java.util.List; import java.util.TreeMap; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.LSPacket; -import rsca.ls.net.PacketQueue; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.packethandler.PacketHandlerDef; -import rsca.ls.util.PersistenceManager; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.FPacket; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.net.PacketQueue; +import org.moparscape.msc.ls.packethandler.PacketHandler; +import org.moparscape.msc.ls.packethandler.PacketHandlerDef; +import org.moparscape.msc.ls.util.PersistenceManager; + public class LoginEngine extends Thread { /** diff --git a/LoginServer/src/rsca/ls/Server.java b/LoginServer/src/org/moparscape/msc/ls/Server.java similarity index 89% rename from LoginServer/src/rsca/ls/Server.java rename to LoginServer/src/org/moparscape/msc/ls/Server.java index eb49213..9b11f55 100644 --- a/LoginServer/src/rsca/ls/Server.java +++ b/LoginServer/src/org/moparscape/msc/ls/Server.java @@ -1,4 +1,4 @@ -package rsca.ls; +package org.moparscape.msc.ls; import java.io.File; import java.io.IOException; @@ -12,13 +12,13 @@ import org.apache.mina.common.IoHandler; import org.apache.mina.transport.socket.nio.SocketAcceptor; import org.apache.mina.transport.socket.nio.SocketAcceptorConfig; import org.apache.mina.transport.socket.nio.SocketSessionConfig; +import org.moparscape.msc.ls.model.PlayerSave; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.DatabaseConnection; +import org.moparscape.msc.ls.net.FConnectionHandler; +import org.moparscape.msc.ls.net.LSConnectionHandler; +import org.moparscape.msc.ls.util.Config; -import rsca.ls.model.PlayerSave; -import rsca.ls.model.World; -import rsca.ls.net.DatabaseConnection; -import rsca.ls.net.FConnectionHandler; -import rsca.ls.net.LSConnectionHandler; -import rsca.ls.util.Config; public class Server { /** diff --git a/LoginServer/src/rsca/ls/codec/FCodecFactory.java b/LoginServer/src/org/moparscape/msc/ls/codec/FCodecFactory.java similarity index 96% rename from LoginServer/src/rsca/ls/codec/FCodecFactory.java rename to LoginServer/src/org/moparscape/msc/ls/codec/FCodecFactory.java index 4a36787..5c4bb8f 100644 --- a/LoginServer/src/rsca/ls/codec/FCodecFactory.java +++ b/LoginServer/src/org/moparscape/msc/ls/codec/FCodecFactory.java @@ -1,4 +1,4 @@ -package rsca.ls.codec; +package org.moparscape.msc.ls.codec; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; diff --git a/LoginServer/src/rsca/ls/codec/FProtocolDecoder.java b/LoginServer/src/org/moparscape/msc/ls/codec/FProtocolDecoder.java similarity index 94% rename from LoginServer/src/rsca/ls/codec/FProtocolDecoder.java rename to LoginServer/src/org/moparscape/msc/ls/codec/FProtocolDecoder.java index 964e754..73dffd5 100644 --- a/LoginServer/src/rsca/ls/codec/FProtocolDecoder.java +++ b/LoginServer/src/org/moparscape/msc/ls/codec/FProtocolDecoder.java @@ -1,4 +1,4 @@ -package rsca.ls.codec; +package org.moparscape.msc.ls.codec; import java.net.URLDecoder; import java.nio.charset.Charset; @@ -8,9 +8,9 @@ import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.CumulativeProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.net.FPacket; -import rsca.ls.Server; -import rsca.ls.net.FPacket; /** * A decoder for the Frontend protocol. Parses the incoming data from an diff --git a/LoginServer/src/rsca/ls/codec/FProtocolEncoder.java b/LoginServer/src/org/moparscape/msc/ls/codec/FProtocolEncoder.java similarity index 93% rename from LoginServer/src/rsca/ls/codec/FProtocolEncoder.java rename to LoginServer/src/org/moparscape/msc/ls/codec/FProtocolEncoder.java index 5cca2ba..0673546 100644 --- a/LoginServer/src/rsca/ls/codec/FProtocolEncoder.java +++ b/LoginServer/src/org/moparscape/msc/ls/codec/FProtocolEncoder.java @@ -1,4 +1,4 @@ -package rsca.ls.codec; +package org.moparscape.msc.ls.codec; import java.net.URLEncoder; @@ -6,9 +6,9 @@ import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoderOutput; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.net.FPacket; -import rsca.ls.Server; -import rsca.ls.net.FPacket; /** * Encodes the high level FPacket class into the proper protocol diff --git a/GameServer/src/msc/gs/connection/LSCodecFactory.java b/LoginServer/src/org/moparscape/msc/ls/codec/LSCodecFactory.java similarity index 96% rename from GameServer/src/msc/gs/connection/LSCodecFactory.java rename to LoginServer/src/org/moparscape/msc/ls/codec/LSCodecFactory.java index 0c4abbc..927945c 100644 --- a/GameServer/src/msc/gs/connection/LSCodecFactory.java +++ b/LoginServer/src/org/moparscape/msc/ls/codec/LSCodecFactory.java @@ -1,4 +1,4 @@ -package msc.gs.connection; +package org.moparscape.msc.ls.codec; import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolDecoder; diff --git a/LoginServer/src/rsca/ls/codec/LSProtocolDecoder.java b/LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolDecoder.java similarity index 95% rename from LoginServer/src/rsca/ls/codec/LSProtocolDecoder.java rename to LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolDecoder.java index 58dd209..5384f22 100644 --- a/LoginServer/src/rsca/ls/codec/LSProtocolDecoder.java +++ b/LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolDecoder.java @@ -1,11 +1,11 @@ -package rsca.ls.codec; +package org.moparscape.msc.ls.codec; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.CumulativeProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; +import org.moparscape.msc.ls.net.LSPacket; -import rsca.ls.net.LSPacket; /** * A decoder for the LS protocol. Parses the incoming data from an IoSession and diff --git a/LoginServer/src/rsca/ls/codec/LSProtocolEncoder.java b/LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolEncoder.java similarity index 93% rename from LoginServer/src/rsca/ls/codec/LSProtocolEncoder.java rename to LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolEncoder.java index 28896cb..39c26ae 100644 --- a/LoginServer/src/rsca/ls/codec/LSProtocolEncoder.java +++ b/LoginServer/src/org/moparscape/msc/ls/codec/LSProtocolEncoder.java @@ -1,12 +1,12 @@ -package rsca.ls.codec; +package org.moparscape.msc.ls.codec; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolEncoder; import org.apache.mina.filter.codec.ProtocolEncoderOutput; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.net.LSPacket; -import rsca.ls.Server; -import rsca.ls.net.LSPacket; /** * Encodes the high level LSPacket class into the proper protocol diff --git a/LoginServer/src/rsca/ls/model/BankItem.java b/LoginServer/src/org/moparscape/msc/ls/model/BankItem.java similarity index 71% rename from LoginServer/src/rsca/ls/model/BankItem.java rename to LoginServer/src/org/moparscape/msc/ls/model/BankItem.java index 29ad9e6..c520856 100644 --- a/LoginServer/src/rsca/ls/model/BankItem.java +++ b/LoginServer/src/org/moparscape/msc/ls/model/BankItem.java @@ -1,4 +1,4 @@ -package rsca.ls.model; +package org.moparscape.msc.ls.model; public class BankItem extends Item { public BankItem(int id, int amount) { diff --git a/LoginServer/src/rsca/ls/model/InvItem.java b/LoginServer/src/org/moparscape/msc/ls/model/InvItem.java similarity index 82% rename from LoginServer/src/rsca/ls/model/InvItem.java rename to LoginServer/src/org/moparscape/msc/ls/model/InvItem.java index 63dedd9..1d4c0be 100644 --- a/LoginServer/src/rsca/ls/model/InvItem.java +++ b/LoginServer/src/org/moparscape/msc/ls/model/InvItem.java @@ -1,4 +1,4 @@ -package rsca.ls.model; +package org.moparscape.msc.ls.model; public class InvItem extends Item { private boolean wielded; diff --git a/LoginServer/src/rsca/ls/model/Item.java b/LoginServer/src/org/moparscape/msc/ls/model/Item.java similarity index 81% rename from LoginServer/src/rsca/ls/model/Item.java rename to LoginServer/src/org/moparscape/msc/ls/model/Item.java index 03173d4..22c4a5e 100644 --- a/LoginServer/src/rsca/ls/model/Item.java +++ b/LoginServer/src/org/moparscape/msc/ls/model/Item.java @@ -1,4 +1,4 @@ -package rsca.ls.model; +package org.moparscape.msc.ls.model; public class Item { private int amount; diff --git a/LoginServer/src/rsca/ls/model/PlayerSave.java b/LoginServer/src/org/moparscape/msc/ls/model/PlayerSave.java similarity index 99% rename from LoginServer/src/rsca/ls/model/PlayerSave.java rename to LoginServer/src/org/moparscape/msc/ls/model/PlayerSave.java index 2178014..f3ba96f 100644 --- a/LoginServer/src/rsca/ls/model/PlayerSave.java +++ b/LoginServer/src/org/moparscape/msc/ls/model/PlayerSave.java @@ -1,12 +1,13 @@ -package rsca.ls.model; +package org.moparscape.msc.ls.model; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; -import rsca.ls.Server; -import rsca.ls.util.DataConversions; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.util.DataConversions; + public class PlayerSave { public static final String[] statArray = { "attack", "defense", "strength", diff --git a/LoginServer/src/rsca/ls/model/World.java b/LoginServer/src/org/moparscape/msc/ls/model/World.java similarity index 91% rename from LoginServer/src/rsca/ls/model/World.java rename to LoginServer/src/org/moparscape/msc/ls/model/World.java index 2cc624b..77a840b 100644 --- a/LoginServer/src/rsca/ls/model/World.java +++ b/LoginServer/src/org/moparscape/msc/ls/model/World.java @@ -1,4 +1,4 @@ -package rsca.ls.model; +package org.moparscape.msc.ls.model; import java.sql.ResultSet; import java.util.Collection; @@ -6,10 +6,10 @@ import java.util.TreeMap; import java.util.Map.Entry; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.packetbuilder.loginserver.MiscPacketBuilder; +import org.moparscape.msc.ls.util.DataConversions; -import rsca.ls.Server; -import rsca.ls.packetbuilder.loginserver.MiscPacketBuilder; -import rsca.ls.util.DataConversions; public class World { private MiscPacketBuilder actionSender = new MiscPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/net/DatabaseConnection.java b/LoginServer/src/org/moparscape/msc/ls/net/DatabaseConnection.java similarity index 96% rename from LoginServer/src/rsca/ls/net/DatabaseConnection.java rename to LoginServer/src/org/moparscape/msc/ls/net/DatabaseConnection.java index fe7a7e8..5c9ea13 100644 --- a/LoginServer/src/rsca/ls/net/DatabaseConnection.java +++ b/LoginServer/src/org/moparscape/msc/ls/net/DatabaseConnection.java @@ -1,4 +1,4 @@ -package rsca.ls.net; +package org.moparscape.msc.ls.net; import java.sql.Connection; import java.sql.DriverManager; @@ -6,8 +6,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import rsca.ls.Server; -import rsca.ls.util.Config; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.util.Config; + /** * Used to interact with the database. diff --git a/LoginServer/src/rsca/ls/net/FConnectionHandler.java b/LoginServer/src/org/moparscape/msc/ls/net/FConnectionHandler.java similarity index 92% rename from LoginServer/src/rsca/ls/net/FConnectionHandler.java rename to LoginServer/src/org/moparscape/msc/ls/net/FConnectionHandler.java index a3b0750..8109ad9 100644 --- a/LoginServer/src/rsca/ls/net/FConnectionHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/net/FConnectionHandler.java @@ -1,12 +1,12 @@ -package rsca.ls.net; +package org.moparscape.msc.ls.net; import org.apache.mina.common.IdleStatus; import org.apache.mina.common.IoHandler; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.moparscape.msc.ls.LoginEngine; +import org.moparscape.msc.ls.codec.FCodecFactory; -import rsca.ls.LoginEngine; -import rsca.ls.codec.FCodecFactory; /** * Handles the protocol events fired from MINA. diff --git a/LoginServer/src/rsca/ls/net/FPacket.java b/LoginServer/src/org/moparscape/msc/ls/net/FPacket.java similarity index 97% rename from LoginServer/src/rsca/ls/net/FPacket.java rename to LoginServer/src/org/moparscape/msc/ls/net/FPacket.java index d4bc770..8a9251b 100644 --- a/LoginServer/src/rsca/ls/net/FPacket.java +++ b/LoginServer/src/org/moparscape/msc/ls/net/FPacket.java @@ -1,4 +1,4 @@ -package rsca.ls.net; +package org.moparscape.msc.ls.net; import org.apache.mina.common.IoSession; diff --git a/LoginServer/src/rsca/ls/net/LSConnectionHandler.java b/LoginServer/src/org/moparscape/msc/ls/net/LSConnectionHandler.java similarity index 90% rename from LoginServer/src/rsca/ls/net/LSConnectionHandler.java rename to LoginServer/src/org/moparscape/msc/ls/net/LSConnectionHandler.java index 3ed45b7..718d033 100644 --- a/LoginServer/src/rsca/ls/net/LSConnectionHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/net/LSConnectionHandler.java @@ -1,14 +1,14 @@ -package rsca.ls.net; +package org.moparscape.msc.ls.net; import org.apache.mina.common.IdleStatus; import org.apache.mina.common.IoHandler; import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.moparscape.msc.ls.LoginEngine; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.codec.LSCodecFactory; +import org.moparscape.msc.ls.model.World; -import rsca.ls.LoginEngine; -import rsca.ls.Server; -import rsca.ls.codec.LSCodecFactory; -import rsca.ls.model.World; /** * Handles the protocol events fired from MINA. diff --git a/LoginServer/src/rsca/ls/net/LSPacket.java b/LoginServer/src/org/moparscape/msc/ls/net/LSPacket.java similarity index 96% rename from LoginServer/src/rsca/ls/net/LSPacket.java rename to LoginServer/src/org/moparscape/msc/ls/net/LSPacket.java index e286579..70c68a4 100644 --- a/LoginServer/src/rsca/ls/net/LSPacket.java +++ b/LoginServer/src/org/moparscape/msc/ls/net/LSPacket.java @@ -1,4 +1,4 @@ -package rsca.ls.net; +package org.moparscape.msc.ls.net; import org.apache.mina.common.IoSession; diff --git a/LoginServer/src/rsca/ls/net/Packet.java b/LoginServer/src/org/moparscape/msc/ls/net/Packet.java similarity index 94% rename from LoginServer/src/rsca/ls/net/Packet.java rename to LoginServer/src/org/moparscape/msc/ls/net/Packet.java index ea3f10a..63a4c08 100644 --- a/LoginServer/src/rsca/ls/net/Packet.java +++ b/LoginServer/src/org/moparscape/msc/ls/net/Packet.java @@ -1,10 +1,10 @@ -package rsca.ls.net; +package org.moparscape.msc.ls.net; import java.net.InetSocketAddress; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; -import rsca.ls.Server; /** * An immutable packet object. diff --git a/LoginServer/src/rsca/ls/net/PacketQueue.java b/LoginServer/src/org/moparscape/msc/ls/net/PacketQueue.java similarity index 91% rename from LoginServer/src/rsca/ls/net/PacketQueue.java rename to LoginServer/src/org/moparscape/msc/ls/net/PacketQueue.java index e976355..ed4ee6d 100644 --- a/LoginServer/src/rsca/ls/net/PacketQueue.java +++ b/LoginServer/src/org/moparscape/msc/ls/net/PacketQueue.java @@ -1,4 +1,4 @@ -package rsca.ls.net; +package org.moparscape.msc.ls.net; import java.util.ArrayList; import java.util.List; diff --git a/LoginServer/src/rsca/ls/packetbuilder/FPacketBuilder.java b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/FPacketBuilder.java similarity index 87% rename from LoginServer/src/rsca/ls/packetbuilder/FPacketBuilder.java rename to LoginServer/src/org/moparscape/msc/ls/packetbuilder/FPacketBuilder.java index 8b24044..85b9950 100644 --- a/LoginServer/src/rsca/ls/packetbuilder/FPacketBuilder.java +++ b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/FPacketBuilder.java @@ -1,6 +1,6 @@ -package rsca.ls.packetbuilder; +package org.moparscape.msc.ls.packetbuilder; -import rsca.ls.net.FPacket; +import org.moparscape.msc.ls.net.FPacket; public class FPacketBuilder extends StaticPacketBuilder { /** diff --git a/LoginServer/src/rsca/ls/packetbuilder/LSPacketBuilder.java b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/LSPacketBuilder.java similarity index 83% rename from LoginServer/src/rsca/ls/packetbuilder/LSPacketBuilder.java rename to LoginServer/src/org/moparscape/msc/ls/packetbuilder/LSPacketBuilder.java index 8c9fde2..a88aec0 100644 --- a/LoginServer/src/rsca/ls/packetbuilder/LSPacketBuilder.java +++ b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/LSPacketBuilder.java @@ -1,10 +1,11 @@ -package rsca.ls.packetbuilder; +package org.moparscape.msc.ls.packetbuilder; import java.util.Random; -import rsca.ls.LoginEngine; -import rsca.ls.net.LSPacket; -import rsca.ls.packethandler.PacketHandler; +import org.moparscape.msc.ls.LoginEngine; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.packethandler.PacketHandler; + public class LSPacketBuilder extends StaticPacketBuilder { /** diff --git a/LoginServer/src/rsca/ls/packetbuilder/StaticPacketBuilder.java b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/StaticPacketBuilder.java similarity index 98% rename from LoginServer/src/rsca/ls/packetbuilder/StaticPacketBuilder.java rename to LoginServer/src/org/moparscape/msc/ls/packetbuilder/StaticPacketBuilder.java index 2c6c8b4..f26f7b4 100644 --- a/LoginServer/src/rsca/ls/packetbuilder/StaticPacketBuilder.java +++ b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/StaticPacketBuilder.java @@ -1,7 +1,7 @@ -package rsca.ls.packetbuilder; +package org.moparscape.msc.ls.packetbuilder; -import rsca.ls.Server; -import rsca.ls.net.Packet; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.net.Packet; /** * A mutable sequence of bytes used to construct the immutable diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/MiscPacketBuilder.java b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/MiscPacketBuilder.java similarity index 88% rename from LoginServer/src/rsca/ls/packetbuilder/loginserver/MiscPacketBuilder.java rename to LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/MiscPacketBuilder.java index 476020b..45c2417 100644 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/MiscPacketBuilder.java +++ b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/MiscPacketBuilder.java @@ -1,13 +1,14 @@ -package rsca.ls.packetbuilder.loginserver; +package org.moparscape.msc.ls.packetbuilder.loginserver; import java.util.ArrayList; import java.util.List; -import rsca.ls.LoginEngine; -import rsca.ls.Server; -import rsca.ls.net.LSPacket; -import rsca.ls.packetbuilder.LSPacketBuilder; -import rsca.ls.packethandler.PacketHandler; +import org.moparscape.msc.ls.LoginEngine; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.packetbuilder.LSPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; + public class MiscPacketBuilder { /** diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java similarity index 88% rename from LoginServer/src/rsca/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java rename to LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java index a140f7d..c7af3ee 100644 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java +++ b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/PlayerLoginPacketBuilder.java @@ -1,16 +1,17 @@ -package rsca.ls.packetbuilder.loginserver; +package org.moparscape.msc.ls.packetbuilder.loginserver; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import rsca.ls.Server; -import rsca.ls.model.BankItem; -import rsca.ls.model.InvItem; -import rsca.ls.model.PlayerSave; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.packetbuilder.LSPacketBuilder; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.BankItem; +import org.moparscape.msc.ls.model.InvItem; +import org.moparscape.msc.ls.model.PlayerSave; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.packetbuilder.LSPacketBuilder; + public class PlayerLoginPacketBuilder { /** diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/ReplyPacketBuilder.java b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/ReplyPacketBuilder.java similarity index 79% rename from LoginServer/src/rsca/ls/packetbuilder/loginserver/ReplyPacketBuilder.java rename to LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/ReplyPacketBuilder.java index eaf6927..71da924 100644 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/ReplyPacketBuilder.java +++ b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/ReplyPacketBuilder.java @@ -1,7 +1,7 @@ -package rsca.ls.packetbuilder.loginserver; +package org.moparscape.msc.ls.packetbuilder.loginserver; -import rsca.ls.net.LSPacket; -import rsca.ls.packetbuilder.LSPacketBuilder; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.packetbuilder.LSPacketBuilder; public class ReplyPacketBuilder { /** diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java similarity index 75% rename from LoginServer/src/rsca/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java rename to LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java index 3a933c4..350f354 100644 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java +++ b/LoginServer/src/org/moparscape/msc/ls/packetbuilder/loginserver/WorldRegisteredPacketBuilder.java @@ -1,7 +1,7 @@ -package rsca.ls.packetbuilder.loginserver; +package org.moparscape.msc.ls.packetbuilder.loginserver; -import rsca.ls.net.LSPacket; -import rsca.ls.packetbuilder.LSPacketBuilder; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.packetbuilder.LSPacketBuilder; public class WorldRegisteredPacketBuilder { /** diff --git a/LoginServer/src/rsca/ls/packethandler/PacketHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandler.java similarity index 62% rename from LoginServer/src/rsca/ls/packethandler/PacketHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandler.java index 7b18cc7..5f4eab2 100644 --- a/LoginServer/src/rsca/ls/packethandler/PacketHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandler.java @@ -1,8 +1,8 @@ -package rsca.ls.packethandler; +package org.moparscape.msc.ls.packethandler; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.net.Packet; -import rsca.ls.net.Packet; public interface PacketHandler { public void handlePacket(Packet p, IoSession session) throws Exception; diff --git a/GameServer/src/msc/gs/phandler/PacketHandlerDef.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandlerDef.java similarity index 92% rename from GameServer/src/msc/gs/phandler/PacketHandlerDef.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandlerDef.java index d09d967..a301816 100644 --- a/GameServer/src/msc/gs/phandler/PacketHandlerDef.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/PacketHandlerDef.java @@ -1,4 +1,4 @@ -package msc.gs.phandler; +package org.moparscape.msc.ls.packethandler; /** * The definition of a packet handler, for use with XStream. diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/Alert.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Alert.java similarity index 66% rename from LoginServer/src/rsca/ls/packethandler/frontend/Alert.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Alert.java index 527291e..93c317f 100644 --- a/LoginServer/src/rsca/ls/packethandler/frontend/Alert.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Alert.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.frontend; +package org.moparscape.msc.ls.packethandler.frontend; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.FPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.FPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class Alert implements PacketHandler { private static final FPacketBuilder builder = new FPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/AuctionHouse.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/AuctionHouse.java similarity index 77% rename from LoginServer/src/rsca/ls/packethandler/frontend/AuctionHouse.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/AuctionHouse.java index 3e9efdc..96a922b 100644 --- a/LoginServer/src/rsca/ls/packethandler/frontend/AuctionHouse.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/AuctionHouse.java @@ -1,16 +1,16 @@ -package rsca.ls.packethandler.frontend; +package org.moparscape.msc.ls.packethandler.frontend; import java.util.ArrayList; import java.io.DataInput; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.FPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.FPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class AuctionHouse implements PacketHandler { private static final FPacketBuilder builder = new FPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/Global.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Global.java similarity index 62% rename from LoginServer/src/rsca/ls/packethandler/frontend/Global.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Global.java index f5b5d2a..e32653c 100644 --- a/LoginServer/src/rsca/ls/packethandler/frontend/Global.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Global.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.frontend; +package org.moparscape.msc.ls.packethandler.frontend; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.FPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.FPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class Global implements PacketHandler { private static final FPacketBuilder builder = new FPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/ListPlayers.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/ListPlayers.java similarity index 76% rename from LoginServer/src/rsca/ls/packethandler/frontend/ListPlayers.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/ListPlayers.java index c24df1e..f0d74b5 100644 --- a/LoginServer/src/rsca/ls/packethandler/frontend/ListPlayers.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/ListPlayers.java @@ -1,15 +1,15 @@ -package rsca.ls.packethandler.frontend; +package org.moparscape.msc.ls.packethandler.frontend; import java.util.ArrayList; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.FPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.FPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class ListPlayers implements PacketHandler { private static final FPacketBuilder builder = new FPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/Logout.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Logout.java similarity index 66% rename from LoginServer/src/rsca/ls/packethandler/frontend/Logout.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Logout.java index 2062036..888f479 100644 --- a/LoginServer/src/rsca/ls/packethandler/frontend/Logout.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Logout.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.frontend; +package org.moparscape.msc.ls.packethandler.frontend; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.FPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.FPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class Logout implements PacketHandler { private static final FPacketBuilder builder = new FPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/Shutdown.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Shutdown.java similarity index 68% rename from LoginServer/src/rsca/ls/packethandler/frontend/Shutdown.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Shutdown.java index e4a4e12..d8fd3a3 100644 --- a/LoginServer/src/rsca/ls/packethandler/frontend/Shutdown.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Shutdown.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.frontend; +package org.moparscape.msc.ls.packethandler.frontend; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.FPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.FPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class Shutdown implements PacketHandler { private static final FPacketBuilder builder = new FPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/Update.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Update.java similarity index 62% rename from LoginServer/src/rsca/ls/packethandler/frontend/Update.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Update.java index a1399fe..5e177fe 100644 --- a/LoginServer/src/rsca/ls/packethandler/frontend/Update.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/frontend/Update.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.frontend; +package org.moparscape.msc.ls.packethandler.frontend; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.FPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.FPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class Update implements PacketHandler { private static final FPacketBuilder builder = new FPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/BanHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java similarity index 78% rename from LoginServer/src/rsca/ls/packethandler/loginserver/BanHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java index 1117188..3d9bcde 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/BanHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java @@ -1,16 +1,16 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.sql.ResultSet; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.loginserver.ReplyPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; +import org.moparscape.msc.ls.util.DataConversions; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.loginserver.ReplyPacketBuilder; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.DataConversions; public class BanHandler implements PacketHandler { private ReplyPacketBuilder builder = new ReplyPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/BanHandler.java.2 b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java.2 similarity index 100% rename from LoginServer/src/rsca/ls/packethandler/loginserver/BanHandler.java.2 rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java.2 diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/BanHandler.java.autothread b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java.autothread similarity index 100% rename from LoginServer/src/rsca/ls/packethandler/loginserver/BanHandler.java.autothread rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/BanHandler.java.autothread diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/FriendHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/FriendHandler.java similarity index 86% rename from LoginServer/src/rsca/ls/packethandler/loginserver/FriendHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/FriendHandler.java index cb850a1..5a5a208 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/FriendHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/FriendHandler.java @@ -1,15 +1,15 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.sql.SQLException; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.PlayerSave; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.PlayerSave; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; public class FriendHandler implements PacketHandler { diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/GameSettingHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/GameSettingHandler.java similarity index 85% rename from LoginServer/src/rsca/ls/packethandler/loginserver/GameSettingHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/GameSettingHandler.java index 393a6a0..e468f72 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/GameSettingHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/GameSettingHandler.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.sql.SQLException; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; public class GameSettingHandler implements PacketHandler { diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/KillHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/KillHandler.java similarity index 69% rename from LoginServer/src/rsca/ls/packethandler/loginserver/KillHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/KillHandler.java index 36fbca9..757a4e4 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/KillHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/KillHandler.java @@ -1,12 +1,12 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.sql.SQLException; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; public class KillHandler implements PacketHandler { diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/LogHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/LogHandler.java similarity index 82% rename from LoginServer/src/rsca/ls/packethandler/loginserver/LogHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/LogHandler.java index d61dbe2..3eb5999 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/LogHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/LogHandler.java @@ -1,15 +1,15 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.io.File; import java.io.PrintWriter; import java.text.SimpleDateFormat; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; +import org.moparscape.msc.ls.util.Config; -import rsca.ls.Server; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.Config; public class LogHandler implements PacketHandler { private static PrintWriter error; diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerInfoRequestHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerInfoRequestHandler.java similarity index 72% rename from LoginServer/src/rsca/ls/packethandler/loginserver/PlayerInfoRequestHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerInfoRequestHandler.java index 831aef2..09dd9fd 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerInfoRequestHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerInfoRequestHandler.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.LSPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.LSPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class PlayerInfoRequestHandler implements PacketHandler { diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerLoginHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java similarity index 86% rename from LoginServer/src/rsca/ls/packethandler/loginserver/PlayerLoginHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java index 0b8c1f1..df0785d 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerLoginHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java @@ -1,4 +1,4 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.sql.ResultSet; import java.sql.SQLException; @@ -6,14 +6,14 @@ import java.util.ArrayList; import java.util.Map.Entry; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.loginserver.PlayerLoginPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; +import org.moparscape.msc.ls.util.DataConversions; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.loginserver.PlayerLoginPacketBuilder; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.DataConversions; public class PlayerLoginHandler implements PacketHandler { public static ArrayList badClients = new ArrayList(); diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerLoginHandler.java.1 b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java.1 similarity index 100% rename from LoginServer/src/rsca/ls/packethandler/loginserver/PlayerLoginHandler.java.1 rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLoginHandler.java.1 diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerLogoutHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLogoutHandler.java similarity index 58% rename from LoginServer/src/rsca/ls/packethandler/loginserver/PlayerLogoutHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLogoutHandler.java index a42f67c..1de7657 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerLogoutHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerLogoutHandler.java @@ -1,10 +1,10 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; public class PlayerLogoutHandler implements PacketHandler { diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerSaveHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java similarity index 82% rename from LoginServer/src/rsca/ls/packethandler/loginserver/PlayerSaveHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java index bc78721..a969769 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/PlayerSaveHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PlayerSaveHandler.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.PlayerSave; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; +import org.moparscape.msc.ls.util.DataConversions; -import rsca.ls.Server; -import rsca.ls.model.PlayerSave; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.DataConversions; public class PlayerSaveHandler implements PacketHandler { diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/PrivacySettingHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PrivacySettingHandler.java similarity index 86% rename from LoginServer/src/rsca/ls/packethandler/loginserver/PrivacySettingHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PrivacySettingHandler.java index 9ed4ce8..559694e 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/PrivacySettingHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/PrivacySettingHandler.java @@ -1,14 +1,14 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.sql.ResultSet; import java.sql.SQLException; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; public class PrivacySettingHandler implements PacketHandler { diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/RegisterWorld.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/RegisterWorld.java similarity index 77% rename from LoginServer/src/rsca/ls/packethandler/loginserver/RegisterWorld.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/RegisterWorld.java index 8761b5b..5aec3c8 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/RegisterWorld.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/RegisterWorld.java @@ -1,16 +1,16 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.sql.SQLException; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.loginserver.WorldRegisteredPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; +import org.moparscape.msc.ls.util.DataConversions; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.loginserver.WorldRegisteredPacketBuilder; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.DataConversions; public class RegisterWorld implements PacketHandler { private WorldRegisteredPacketBuilder builder = new WorldRegisteredPacketBuilder(); diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/ReportHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/ReportHandler.java similarity index 77% rename from LoginServer/src/rsca/ls/packethandler/loginserver/ReportHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/ReportHandler.java index d536d32..e6b9062 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/ReportHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/ReportHandler.java @@ -1,13 +1,13 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import java.sql.SQLException; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; public class ReportHandler implements PacketHandler { diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/SaveProfilesRequestHandler.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/SaveProfilesRequestHandler.java similarity index 68% rename from LoginServer/src/rsca/ls/packethandler/loginserver/SaveProfilesRequestHandler.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/SaveProfilesRequestHandler.java index 98d6f62..447b086 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/SaveProfilesRequestHandler.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/SaveProfilesRequestHandler.java @@ -1,12 +1,12 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.model.World; +import org.moparscape.msc.ls.net.LSPacket; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packetbuilder.loginserver.ReplyPacketBuilder; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.loginserver.ReplyPacketBuilder; -import rsca.ls.packethandler.PacketHandler; public class SaveProfilesRequestHandler implements PacketHandler { private ReplyPacketBuilder builder = new ReplyPacketBuilder(); @@ -17,7 +17,7 @@ public class SaveProfilesRequestHandler implements PacketHandler { System.out.println("World " + world.getID() + " requested we save all profiles"); /** try { - //Runtime.getRuntime().exec("/home/rsca/unblock"); + //Runtime.getRuntime().exec("/home/org.moparscape.msc/unblock"); } catch (Exception err) { System.out.println(err); } diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/Tradelog.java b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/Tradelog.java similarity index 74% rename from LoginServer/src/rsca/ls/packethandler/loginserver/Tradelog.java rename to LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/Tradelog.java index b276af4..5cfe1c7 100644 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/Tradelog.java +++ b/LoginServer/src/org/moparscape/msc/ls/packethandler/loginserver/Tradelog.java @@ -1,10 +1,10 @@ -package rsca.ls.packethandler.loginserver; +package org.moparscape.msc.ls.packethandler.loginserver; import org.apache.mina.common.IoSession; +import org.moparscape.msc.ls.Server; +import org.moparscape.msc.ls.net.Packet; +import org.moparscape.msc.ls.packethandler.PacketHandler; -import rsca.ls.Server; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; public class Tradelog implements PacketHandler { public void handlePacket(Packet p, IoSession session) throws Exception { diff --git a/LoginServer/src/rsca/ls/util/Config.java b/LoginServer/src/org/moparscape/msc/ls/util/Config.java similarity index 97% rename from LoginServer/src/rsca/ls/util/Config.java rename to LoginServer/src/org/moparscape/msc/ls/util/Config.java index e062ac2..daef1ba 100644 --- a/LoginServer/src/rsca/ls/util/Config.java +++ b/LoginServer/src/org/moparscape/msc/ls/util/Config.java @@ -1,4 +1,4 @@ -package rsca.ls.util; +package org.moparscape.msc.ls.util; /** * A class to handle loading configuration from XML diff --git a/LoginServer/src/rsca/ls/util/DataConversions.java b/LoginServer/src/org/moparscape/msc/ls/util/DataConversions.java similarity index 93% rename from LoginServer/src/rsca/ls/util/DataConversions.java rename to LoginServer/src/org/moparscape/msc/ls/util/DataConversions.java index 7e1279c..93501a6 100644 --- a/LoginServer/src/rsca/ls/util/DataConversions.java +++ b/LoginServer/src/org/moparscape/msc/ls/util/DataConversions.java @@ -1,4 +1,4 @@ -package rsca.ls.util; +package org.moparscape.msc.ls.util; public class DataConversions { /** diff --git a/LoginServer/src/rsca/ls/util/PersistenceManager.java b/LoginServer/src/org/moparscape/msc/ls/util/PersistenceManager.java similarity index 92% rename from LoginServer/src/rsca/ls/util/PersistenceManager.java rename to LoginServer/src/org/moparscape/msc/ls/util/PersistenceManager.java index bd7eba2..a0de85a 100644 --- a/LoginServer/src/rsca/ls/util/PersistenceManager.java +++ b/LoginServer/src/org/moparscape/msc/ls/util/PersistenceManager.java @@ -1,4 +1,4 @@ -package rsca.ls.util; +package org.moparscape.msc.ls.util; import java.io.File; import java.io.FileInputStream; @@ -11,7 +11,8 @@ import java.util.Properties; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import rsca.ls.Server; +import org.moparscape.msc.ls.Server; + import com.thoughtworks.xstream.XStream; diff --git a/LoginServer/src/rsca/.svn/entries b/LoginServer/src/rsca/.svn/entries deleted file mode 100644 index ccd8881..0000000 --- a/LoginServer/src/rsca/.svn/entries +++ /dev/null @@ -1,40 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca -svn://localhost - - - -2010-05-11T21:03:18.514539Z -416 -ollie - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -config -dir - -gs -dir - -irc -dir - -ls -dir - diff --git a/LoginServer/src/rsca/.svn/format b/LoginServer/src/rsca/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/.svn/entries b/LoginServer/src/rsca/ls/.svn/entries deleted file mode 100644 index f0691d4..0000000 --- a/LoginServer/src/rsca/ls/.svn/entries +++ /dev/null @@ -1,114 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls -svn://localhost - - - -2010-01-10T17:31:45.404426Z -376 -ollie - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -model -dir - -packethandler -dir - -net -dir - -Server.java -file - - - - -2009-10-23T16:32:26.000000Z -0f98b18225ba5b1a5a2a8e28246fa0bc -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -4953 - -codec -dir - -util -dir - -packetbuilder -dir - -LoginEngine.java -file - - - - -2009-10-23T16:32:26.000000Z -aa2a40d72bd588d1e1c09695939dc34b -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -4418 - diff --git a/LoginServer/src/rsca/ls/.svn/format b/LoginServer/src/rsca/ls/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/.svn/text-base/LoginEngine.java.svn-base b/LoginServer/src/rsca/ls/.svn/text-base/LoginEngine.java.svn-base deleted file mode 100644 index 3987100..0000000 --- a/LoginServer/src/rsca/ls/.svn/text-base/LoginEngine.java.svn-base +++ /dev/null @@ -1,151 +0,0 @@ -package rsca.ls; - -import java.util.List; -import java.util.TreeMap; - -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.LSPacket; -import rsca.ls.net.PacketQueue; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.packethandler.PacketHandlerDef; -import rsca.ls.util.PersistenceManager; - -public class LoginEngine extends Thread { - /** - * The mapping of packet IDs to their handler - */ - private TreeMap FPacketHandlers = new TreeMap(); - /** - * The packet queue to be processed - */ - private PacketQueue FPacketQueue; - /** - * The mapping of packet IDs to their handler - */ - private TreeMap LSPacketHandlers = new TreeMap(); - /** - * The packet queue to be processed - */ - private PacketQueue LSPacketQueue; - /** - * Should we be running? - */ - private boolean running = true; - /** - * The main server - */ - private Server server; - /** - * The mapping of packet UIDs to their handler - */ - private TreeMap uniqueHandlers = new TreeMap(); - - public LoginEngine(Server server) { - this.server = server; - LSPacketQueue = new PacketQueue(); - FPacketQueue = new PacketQueue(); - loadPacketHandlers(); - } - - public PacketQueue getFPacketQueue() { - return FPacketQueue; - } - - public PacketQueue getLSPacketQueue() { - return LSPacketQueue; - } - - /** - * Loads the packet handling classes from the persistence manager. - */ - protected void loadPacketHandlers() { - PacketHandlerDef[] handlerDefs = (PacketHandlerDef[]) PersistenceManager.load("LSPacketHandlers.xml"); - for (PacketHandlerDef handlerDef : handlerDefs) { - try { - String className = handlerDef.getClassName(); - Class c = Class.forName(className); - if (c != null) { - PacketHandler handler = (PacketHandler) c.newInstance(); - for (int packetID : handlerDef.getAssociatedPackets()) { - LSPacketHandlers.put(packetID, handler); - } - } - } catch (Exception e) { - Server.error(e); - } - } - handlerDefs = (PacketHandlerDef[]) PersistenceManager.load("FPacketHandlers.xml"); - for (PacketHandlerDef handlerDef : handlerDefs) { - try { - String className = handlerDef.getClassName(); - Class c = Class.forName(className); - if (c != null) { - PacketHandler handler = (PacketHandler) c.newInstance(); - for (int packetID : handlerDef.getAssociatedPackets()) { - FPacketHandlers.put(packetID, handler); - } - } - } catch (Exception e) { - Server.error(e); - } - } - } - - /** - * Processes incoming packets. - */ - private void processIncomingPackets() { - for (LSPacket p : LSPacketQueue.getPackets()) { - PacketHandler handler; - if (((handler = uniqueHandlers.get(p.getUID())) != null) || ((handler = LSPacketHandlers.get(p.getID())) != null)) { - try { - handler.handlePacket(p, p.getSession()); - uniqueHandlers.remove(p.getUID()); - } catch (Exception e) { - Server.error("Exception with p[" + p.getID() + "]: " + e); - } - } else { - Server.error("Unhandled packet from server: " + p.getID()); - } - } - for (FPacket p : FPacketQueue.getPackets()) { - PacketHandler handler = FPacketHandlers.get(p.getID()); - if (handler != null) { - try { - handler.handlePacket(p, p.getSession()); - } catch (Exception e) { - Server.error("Exception with p[" + p.getID() + "]: " + e); - } - } else { - Server.error("Unhandled packet from frontend: " + p.getID()); - } - } - } - - public void processOutgoingPackets() { - for (World w : server.getWorlds()) { - List packets = w.getActionSender().getPackets(); - for (LSPacket packet : packets) { - w.getSession().write(packet); - } - w.getActionSender().clearPackets(); - } - } - - public void run() { - System.out.println("LoginEngine now running"); - while (running) { - try { - Thread.sleep(50); - } catch (InterruptedException ie) { - } - processIncomingPackets(); - processOutgoingPackets(); - } - } - - public void setHandler(long uID, PacketHandler handler) { - uniqueHandlers.put(uID, handler); - } -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/.svn/text-base/Server.java.svn-base b/LoginServer/src/rsca/ls/.svn/text-base/Server.java.svn-base deleted file mode 100644 index eb49213..0000000 --- a/LoginServer/src/rsca/ls/.svn/text-base/Server.java.svn-base +++ /dev/null @@ -1,197 +0,0 @@ -package rsca.ls; - -import java.io.File; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.Collection; -import java.util.TreeMap; - -import org.apache.mina.common.IoAcceptor; -import org.apache.mina.common.IoAcceptorConfig; -import org.apache.mina.common.IoHandler; -import org.apache.mina.transport.socket.nio.SocketAcceptor; -import org.apache.mina.transport.socket.nio.SocketAcceptorConfig; -import org.apache.mina.transport.socket.nio.SocketSessionConfig; - -import rsca.ls.model.PlayerSave; -import rsca.ls.model.World; -import rsca.ls.net.DatabaseConnection; -import rsca.ls.net.FConnectionHandler; -import rsca.ls.net.LSConnectionHandler; -import rsca.ls.util.Config; - -public class Server { - /** - * Connection to the MySQL database - */ - public static DatabaseConnection db; - private static Server server; - - public static void error(Object o) { - if (o instanceof Exception) { - Exception e = (Exception) o; - e.printStackTrace(); - System.exit(1); - return;// Adding save data - } - System.err.println(o.toString()); - } - - public static Server getServer() { - if (server == null) { - server = new Server(); - } - return server; - } - - public static void main(String[] args) throws IOException { - String configFile = "conf/ls/Conf.xml"; - if (args.length > 0) { - File f = new File(args[0]); - if (f.exists()) { - configFile = f.getName(); - } - } - System.out.println("Login Server starting up..."); - Config.initConfig(configFile); - db = new DatabaseConnection(); - System.out.println("Connected to MySQL"); - Server.getServer(); - } - - /** - * The login engine - */ - private LoginEngine engine; - /** - * The Server SocketAcceptor - */ - private IoAcceptor frontendAcceptor; - - private TreeMap idleWorlds = new TreeMap(); - - /** - * The Server SocketAcceptor - */ - private IoAcceptor serverAcceptor; - - private TreeMap worlds = new TreeMap(); - - private Server() { - try { - engine = new LoginEngine(this); - engine.start(); - serverAcceptor = createListener(Config.LS_IP, Config.LS_PORT, new LSConnectionHandler(engine)); - frontendAcceptor = createListener(Config.QUERY_IP, Config.QUERY_PORT, new FConnectionHandler(engine)); - } catch (IOException e) { - Server.error(e); - } - } - - private IoAcceptor createListener(String ip, int port, IoHandler handler) throws IOException { - IoAcceptor acceptor = new SocketAcceptor(); - IoAcceptorConfig config = new SocketAcceptorConfig(); - config.setDisconnectOnUnbind(true); - ((SocketSessionConfig) config.getSessionConfig()).setReuseAddress(true); - acceptor.bind(new InetSocketAddress(ip, port), handler, config); - return acceptor; - } - - public PlayerSave findSave(long user, World world) { - PlayerSave save = null; - // for(World w : getWorlds()) { - // PlayerSave s = w.getSave(user); - // if(s != null) { - // w.unassosiateSave(s); - // save = s; - // System.out.println("Found cached save for " + - // DataConversions.hashToUsername(user)); - // break; - // } - // } - // if(save == null) { - // System.out.println("No save found for " + - // DataConversions.hashToUsername(user) + ", loading fresh"); - save = PlayerSave.loadPlayer(user); - // } - // world.assosiateSave(save); - return save; - } - - public World findWorld(long user) { - for (World w : getWorlds()) { - if (w.hasPlayer(user)) { - return w; - } - } - return null; - } - - public LoginEngine getEngine() { - return engine; - } - - public World getIdleWorld(int id) { - return idleWorlds.get(id); - } - - public World getWorld(int id) { - if (id < 0) { - return null; - } - return worlds.get(id); - } - - public Collection getWorlds() { - return worlds.values(); - } - - public boolean isRegistered(World world) { - return getWorld(world.getID()) != null; - } - - public void kill() { - try { - serverAcceptor.unbindAll(); - frontendAcceptor.unbindAll(); - db.close(); - } catch (Exception e) { - Server.error(e); - } - } - - public boolean registerWorld(World world) { - int id = world.getID(); - if (id < 0 || getWorld(id) != null) { - return false; - } - worlds.put(id, world); - return true; - } - - public void setIdle(World world, boolean idle) { - if (idle) { - worlds.remove(world.getID()); - idleWorlds.put(world.getID(), world); - } else { - idleWorlds.remove(world.getID()); - worlds.put(world.getID(), world); - } - } - - public boolean unregisterWorld(World world) { - int id = world.getID(); - if (id < 0) { - return false; - } - if (getWorld(id) != null) { - worlds.remove(id); - return true; - } - if (getIdleWorld(id) != null) { - idleWorlds.remove(id); - return true; - } - return false; - } -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/codec/.svn/entries b/LoginServer/src/rsca/ls/codec/.svn/entries deleted file mode 100644 index 1e02205..0000000 --- a/LoginServer/src/rsca/ls/codec/.svn/entries +++ /dev/null @@ -1,232 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/codec -svn://localhost - - - -2009-09-05T12:50:46.724777Z -203 -xEnt - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -LSProtocolEncoder.java -file - - - - -2009-10-23T16:32:26.000000Z -f1fbfeb7a997cd6e4257400a814748e9 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1672 - -LSCodecFactory.java -file - - - - -2009-10-23T16:32:26.000000Z -642bf852c4e06814c082aa565d1f0025 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -948 - -LSProtocolDecoder.java -file - - - - -2009-10-23T16:32:26.000000Z -ed921789a473d03e6ea92a3fc369dbb4 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1715 - -FProtocolEncoder.java -file - - - - -2009-10-23T16:32:26.000000Z -03daaf73854a3261473dec97593e3013 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1698 - -FCodecFactory.java -file - - - - -2009-10-23T16:32:26.000000Z -18366d0f130bdd71539843da777511f1 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -954 - -FProtocolDecoder.java -file - - - - -2009-10-23T16:32:26.000000Z -4258b3a0fbee2897c5fd98c402abc831 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2234 - diff --git a/LoginServer/src/rsca/ls/codec/.svn/format b/LoginServer/src/rsca/ls/codec/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/codec/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/codec/.svn/text-base/FCodecFactory.java.svn-base b/LoginServer/src/rsca/ls/codec/.svn/text-base/FCodecFactory.java.svn-base deleted file mode 100644 index 4a36787..0000000 --- a/LoginServer/src/rsca/ls/codec/.svn/text-base/FCodecFactory.java.svn-base +++ /dev/null @@ -1,38 +0,0 @@ -package rsca.ls.codec; - -import org.apache.mina.filter.codec.ProtocolCodecFactory; -import org.apache.mina.filter.codec.ProtocolDecoder; -import org.apache.mina.filter.codec.ProtocolEncoder; - -/** - * Provides access to the protocol encoders and decoders for the Frontend - * protocol. - */ -public class FCodecFactory implements ProtocolCodecFactory { - /** - * The protocol decoder in use - */ - private static ProtocolDecoder decoder = new FProtocolDecoder(); - /** - * The protocol encoder in use - */ - private static ProtocolEncoder encoder = new FProtocolEncoder(); - - /** - * Provides the decoder to use to format outgoing data. - * - * @return A protocol decoder - */ - public ProtocolDecoder getDecoder() { - return decoder; - } - - /** - * Provides the encoder to use to parse incoming data. - * - * @return A protocol encoder - */ - public ProtocolEncoder getEncoder() { - return encoder; - } -} diff --git a/LoginServer/src/rsca/ls/codec/.svn/text-base/FProtocolDecoder.java.svn-base b/LoginServer/src/rsca/ls/codec/.svn/text-base/FProtocolDecoder.java.svn-base deleted file mode 100644 index 964e754..0000000 --- a/LoginServer/src/rsca/ls/codec/.svn/text-base/FProtocolDecoder.java.svn-base +++ /dev/null @@ -1,79 +0,0 @@ -package rsca.ls.codec; - -import java.net.URLDecoder; -import java.nio.charset.Charset; -import java.nio.charset.CharsetDecoder; - -import org.apache.mina.common.ByteBuffer; -import org.apache.mina.common.IoSession; -import org.apache.mina.filter.codec.CumulativeProtocolDecoder; -import org.apache.mina.filter.codec.ProtocolDecoderOutput; - -import rsca.ls.Server; -import rsca.ls.net.FPacket; - -/** - * A decoder for the Frontend protocol. Parses the incoming data from an - * IoSession and outputs it as a FPacket object. - */ -public class FProtocolDecoder extends CumulativeProtocolDecoder { - private static CharsetDecoder stringDecoder; - - static { - try { - stringDecoder = Charset.forName("UTF-8").newDecoder(); - } catch (Exception e) { - Server.error(e); - } - } - - /** - * Releases the buffer used by the given session. - * - * @param session - * The session for which to release the buffer - * @throws Exception - * if failed to dispose all resources - */ - public void dispose(IoSession session) throws Exception { - super.dispose(session); - } - - /** - * Parses the data in the provided byte buffer and writes it to - * out as a FPacket. - * - * @param session - * The IoSession the data was read from - * @param in - * The buffer - * @param out - * The decoder output stream to which to write the - * FPacket - * @return Whether enough data was available to create a packet - */ - protected boolean doDecode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out) { - try { - String s = in.getString(stringDecoder).trim(); - int delim = s.indexOf(" "); - - int id; - String[] params; - if (delim > -1) { - id = Integer.parseInt(s.substring(0, delim)); - params = s.substring(delim + 1).split(" "); - } else { - id = Integer.parseInt(s); - params = new String[0]; - } - for (int i = 0; i < params.length; i++) { - params[i] = URLDecoder.decode(params[i], "UTF-8"); - } - out.write(new FPacket(session, id, params)); - return true; - } catch (Exception e) { - Server.error(e); - } - return false; - } -} diff --git a/LoginServer/src/rsca/ls/codec/.svn/text-base/FProtocolEncoder.java.svn-base b/LoginServer/src/rsca/ls/codec/.svn/text-base/FProtocolEncoder.java.svn-base deleted file mode 100644 index 5cca2ba..0000000 --- a/LoginServer/src/rsca/ls/codec/.svn/text-base/FProtocolEncoder.java.svn-base +++ /dev/null @@ -1,62 +0,0 @@ -package rsca.ls.codec; - -import java.net.URLEncoder; - -import org.apache.mina.common.ByteBuffer; -import org.apache.mina.common.IoSession; -import org.apache.mina.filter.codec.ProtocolEncoder; -import org.apache.mina.filter.codec.ProtocolEncoderOutput; - -import rsca.ls.Server; -import rsca.ls.net.FPacket; - -/** - * Encodes the high level FPacket class into the proper protocol - * data required for transmission. - */ -public class FProtocolEncoder implements ProtocolEncoder { - /** - * Releases all resources used by this encoder. - * - * @param session - * The IO session - */ - public void dispose(IoSession session) { - } - - /** - * Converts a FPacket object into the raw data needed for - * transmission. - * - * @param session - * The IO session associated with the packet - * @param message - * A FPacket to encode - * @param out - * The output stream to which to write the data - */ - public void encode(IoSession session, Object message, ProtocolEncoderOutput out) { - if (!(message instanceof FPacket)) { - Server.error(new Exception("Wrong packet type! " + message.toString())); - return; - } - FPacket p = (FPacket) message; - - try { - String s = String.valueOf(p.getID()); - if (p.countParameters() > 0) { - for (String param : p.getParameters()) { - s += " " + URLEncoder.encode(param, "UTF-8"); - } - } - byte[] data = s.getBytes(); - - ByteBuffer buffer = ByteBuffer.allocate(data.length); - buffer.put(data, 0, data.length); - buffer.flip(); - out.write(buffer); - } catch (Exception e) { - Server.error(e); - } - } -} diff --git a/LoginServer/src/rsca/ls/codec/.svn/text-base/LSCodecFactory.java.svn-base b/LoginServer/src/rsca/ls/codec/.svn/text-base/LSCodecFactory.java.svn-base deleted file mode 100644 index 1365527..0000000 --- a/LoginServer/src/rsca/ls/codec/.svn/text-base/LSCodecFactory.java.svn-base +++ /dev/null @@ -1,37 +0,0 @@ -package rsca.ls.codec; - -import org.apache.mina.filter.codec.ProtocolCodecFactory; -import org.apache.mina.filter.codec.ProtocolDecoder; -import org.apache.mina.filter.codec.ProtocolEncoder; - -/** - * Provides access to the protocol encoders and decoders for the LS protocol. - */ -public class LSCodecFactory implements ProtocolCodecFactory { - /** - * The protocol decoder in use - */ - private static ProtocolDecoder decoder = new LSProtocolDecoder(); - /** - * The protocol encoder in use - */ - private static ProtocolEncoder encoder = new LSProtocolEncoder(); - - /** - * Provides the decoder to use to format outgoing data. - * - * @return A protocol decoder - */ - public ProtocolDecoder getDecoder() { - return decoder; - } - - /** - * Provides the encoder to use to parse incoming data. - * - * @return A protocol encoder - */ - public ProtocolEncoder getEncoder() { - return encoder; - } -} diff --git a/LoginServer/src/rsca/ls/codec/.svn/text-base/LSProtocolDecoder.java.svn-base b/LoginServer/src/rsca/ls/codec/.svn/text-base/LSProtocolDecoder.java.svn-base deleted file mode 100644 index 58dd209..0000000 --- a/LoginServer/src/rsca/ls/codec/.svn/text-base/LSProtocolDecoder.java.svn-base +++ /dev/null @@ -1,59 +0,0 @@ -package rsca.ls.codec; - -import org.apache.mina.common.ByteBuffer; -import org.apache.mina.common.IoSession; -import org.apache.mina.filter.codec.CumulativeProtocolDecoder; -import org.apache.mina.filter.codec.ProtocolDecoderOutput; - -import rsca.ls.net.LSPacket; - -/** - * A decoder for the LS protocol. Parses the incoming data from an IoSession and - * outputs it as a LSPacket object. - */ -public class LSProtocolDecoder extends CumulativeProtocolDecoder { - /** - * Releases the buffer used by the given session. - * - * @param session - * The session for which to release the buffer - * @throws Exception - * if failed to dispose all resources - */ - public void dispose(IoSession session) throws Exception { - super.dispose(session); - } - - /** - * Parses the data in the provided byte buffer and writes it to - * out as a LSPacket. - * - * @param session - * The IoSession the data was read from - * @param in - * The buffer - * @param out - * The decoder output stream to which to write the - * LSPacket - * @return Whether enough data was available to create a packet - */ - protected boolean doDecode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out) { - if (in.remaining() >= 13) { - int length = in.getInt(); - if (length <= in.remaining()) { - byte[] payload = new byte[length - 9]; - - int id = in.getUnsigned(); - long uid = in.getLong(); - in.get(payload); - - out.write(new LSPacket(session, id, uid, payload)); - return true; - } else { - in.rewind(); - return false; - } - } - return false; - } -} diff --git a/LoginServer/src/rsca/ls/codec/.svn/text-base/LSProtocolEncoder.java.svn-base b/LoginServer/src/rsca/ls/codec/.svn/text-base/LSProtocolEncoder.java.svn-base deleted file mode 100644 index 28896cb..0000000 --- a/LoginServer/src/rsca/ls/codec/.svn/text-base/LSProtocolEncoder.java.svn-base +++ /dev/null @@ -1,60 +0,0 @@ -package rsca.ls.codec; - -import org.apache.mina.common.ByteBuffer; -import org.apache.mina.common.IoSession; -import org.apache.mina.filter.codec.ProtocolEncoder; -import org.apache.mina.filter.codec.ProtocolEncoderOutput; - -import rsca.ls.Server; -import rsca.ls.net.LSPacket; - -/** - * Encodes the high level LSPacket class into the proper protocol - * data required for transmission. - */ -public class LSProtocolEncoder implements ProtocolEncoder { - /** - * Releases all resources used by this encoder. - * - * @param session - * The IO session - */ - public void dispose(IoSession session) { - } - - /** - * Converts a LSPacket object into the raw data needed for - * transmission. - * - * @param session - * The IO session associated with the packet - * @param message - * A LSPacket to encode - * @param out - * The output stream to which to write the data - */ - public void encode(IoSession session, Object message, ProtocolEncoderOutput out) { - if (!(message instanceof LSPacket)) { - Server.error(new Exception("Wrong packet type! " + message.toString())); - return; - } - LSPacket p = (LSPacket) message; - byte[] data = p.getData(); - int packetLength = data.length; - ByteBuffer buffer; - if (!p.isBare()) { - buffer = ByteBuffer.allocate(data.length + 13); - packetLength += 9; - - buffer.putInt(packetLength); - buffer.put((byte) p.getID()); - buffer.putLong(p.getUID()); - - } else { - buffer = ByteBuffer.allocate(data.length); - } - buffer.put(data, 0, data.length); - buffer.flip(); - out.write(buffer); - } -} diff --git a/LoginServer/src/rsca/ls/model/.svn/entries b/LoginServer/src/rsca/ls/model/.svn/entries deleted file mode 100644 index a3df656..0000000 --- a/LoginServer/src/rsca/ls/model/.svn/entries +++ /dev/null @@ -1,198 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/model -svn://localhost - - - -2009-10-02T12:11:17.749143Z -285 -Pets - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -World.java -file - - - - -2009-10-23T16:32:26.000000Z -212fe0031f376c3a7c848e878095c16c -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -3664 - -BankItem.java -file - - - - -2009-10-23T16:32:26.000000Z -775b388d13f2293a2809460016378299 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -136 - -InvItem.java -file - - - - -2009-10-23T16:32:26.000000Z -e52c8f3a866ccf78c193d12c12952e66 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -270 - -PlayerSave.java -file - - - - -2009-10-23T16:32:26.000000Z -918471c0ed2945a4641398fb64c1da99 -2009-10-02T12:11:17.749143Z -285 -Pets - - - - - - - - - - - - - - - - - - - - - -14261 - -Item.java -file - - - - -2009-10-23T16:32:26.000000Z -005b82c6cde8cf9922012974f83bc706 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -286 - diff --git a/LoginServer/src/rsca/ls/model/.svn/format b/LoginServer/src/rsca/ls/model/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/model/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/model/.svn/text-base/BankItem.java.svn-base b/LoginServer/src/rsca/ls/model/.svn/text-base/BankItem.java.svn-base deleted file mode 100644 index 29ad9e6..0000000 --- a/LoginServer/src/rsca/ls/model/.svn/text-base/BankItem.java.svn-base +++ /dev/null @@ -1,7 +0,0 @@ -package rsca.ls.model; - -public class BankItem extends Item { - public BankItem(int id, int amount) { - super(id, amount); - } -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/model/.svn/text-base/InvItem.java.svn-base b/LoginServer/src/rsca/ls/model/.svn/text-base/InvItem.java.svn-base deleted file mode 100644 index 63dedd9..0000000 --- a/LoginServer/src/rsca/ls/model/.svn/text-base/InvItem.java.svn-base +++ /dev/null @@ -1,14 +0,0 @@ -package rsca.ls.model; - -public class InvItem extends Item { - private boolean wielded; - - public InvItem(int id, int amount, boolean wielded) { - super(id, amount); - this.wielded = wielded; - } - - public boolean isWielded() { - return wielded; - } -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/model/.svn/text-base/Item.java.svn-base b/LoginServer/src/rsca/ls/model/.svn/text-base/Item.java.svn-base deleted file mode 100644 index 03173d4..0000000 --- a/LoginServer/src/rsca/ls/model/.svn/text-base/Item.java.svn-base +++ /dev/null @@ -1,19 +0,0 @@ -package rsca.ls.model; - -public class Item { - private int amount; - private int id; - - public Item(int id, int amount) { - this.id = id; - this.amount = amount; - } - - public int getAmount() { - return amount; - } - - public int getID() { - return id; - } -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/model/.svn/text-base/PlayerSave.java.svn-base b/LoginServer/src/rsca/ls/model/.svn/text-base/PlayerSave.java.svn-base deleted file mode 100644 index 0fb2510..0000000 --- a/LoginServer/src/rsca/ls/model/.svn/text-base/PlayerSave.java.svn-base +++ /dev/null @@ -1,528 +0,0 @@ -package rsca.ls.model; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; - -import rsca.ls.Server; -import rsca.ls.util.DataConversions; - -public class PlayerSave { - public static final String[] statArray = { "attack", "defense", "strength", "hits", "ranged", "prayer", "magic", "cooking", "woodcut", "fletching", "fishing", "firemaking", "crafting", "smithing", "mining", "herblaw", "agility", "thieving" }; - - public static PlayerSave loadPlayer(long user) { - PlayerSave save = new PlayerSave(user); - ResultSet result; - - try { - result = Server.db.getQuery("SELECT r.*, u.username AS owner_username, u.group_id as gid, u.sub_expires as subexp FROM `rsca2_players` AS r INNER JOIN `users` AS u ON u.id=r.owner WHERE `user`='" + save.getUser() + "'"); - if (!result.next()) { - return save; - } - - int subexp = result.getInt("subexp"); - long now = System.currentTimeMillis() / 1000; - int sowner = result.getInt("owner"); - if (result.getInt("gid") == 8) { - save.setOwner(sowner, Integer.parseInt("5"), result.getLong("subexp")); - } else { - save.setOwner(sowner, result.getInt("group_id"), result.getLong("subexp")); - } - save.setMuted(result.getLong("muted")); - /* - * if(subexp - now < 1) { - * Server.db.updateQuery("UPDATE users SET group_id='4' WHERE `id`='" - * + sowner + "'"); save.setOwner(sowner, 0, - * result.getLong("subexp")); } - */ - - save.setLogin(result.getLong("login_date"), DataConversions.IPToLong(result.getString("login_ip"))); - save.setLocation(result.getInt("x"), result.getInt("y")); - - save.setFatigue(result.getInt("fatigue")); - save.setCombatStyle((byte) result.getInt("combatstyle")); - - save.setPrivacy(result.getInt("block_chat") == 1, result.getInt("block_private") == 1, result.getInt("block_trade") == 1, result.getInt("block_duel") == 1); - save.setSettings(result.getInt("cameraauto") == 1, result.getInt("onemouse") == 1, result.getInt("soundoff") == 1, result.getInt("showroof") == 1, result.getInt("autoscreenshot") == 1, result.getInt("combatwindow") == 1); - - save.setAppearance((byte) result.getInt("haircolour"), (byte) result.getInt("topcolour"), (byte) result.getInt("trousercolour"), (byte) result.getInt("skincolour"), (byte) result.getInt("headsprite"), (byte) result.getInt("bodysprite"), result.getInt("male") == 1, result.getInt("skulled")); - - save.setQuestPoints(result.getInt("quest_points")); - - result = Server.db.getQuery("SELECT * FROM `rsca2_experience` WHERE `user`='" + save.getUser() + "'"); - if (!result.next()) { - return save; - } - for (int i = 0; i < 18; i++) { - save.setExp(i, result.getInt("exp_" + statArray[i])); - } - - result = Server.db.getQuery("SELECT * FROM `rsca2_curstats` WHERE `user`='" + save.getUser() + "'"); - if (!result.next()) { - return save; - } - for (int i = 0; i < 18; i++) { - save.setLvl(i, result.getInt("cur_" + statArray[i])); - } - - result = Server.db.getQuery("SELECT id,amount,wielded FROM `rsca2_invitems` WHERE `user`='" + save.getUser() + "' ORDER BY `slot` ASC"); - while (result.next()) { - save.addInvItem(result.getInt("id"), result.getInt("amount"), result.getInt("wielded") == 1); - } - - result = Server.db.getQuery("SELECT id,amount FROM `rsca2_bank` WHERE `user`='" + save.getUser() + "' ORDER BY `slot` ASC"); - while (result.next()) { - save.addBankItem(result.getInt("id"), result.getInt("amount")); - } - - result = Server.db.getQuery("SELECT friend FROM `rsca2_friends` WHERE `user`='" + save.getUser() + "'"); - while (result.next()) { - save.addFriend(result.getLong("friend")); - } - - result = Server.db.getQuery("SELECT `ignore` FROM `rsca2_ignores` WHERE `user`='" + save.getUser() + "'"); - while (result.next()) { - save.addIgnore(result.getLong("ignore")); - } - result = Server.db.getQuery("SELECT * FROM `rsca2_quests` WHERE `user`='" + save.getUser() + "'"); - while (result.next()) { - save.setQuestStage(result.getInt("id"), result.getInt("stage")); - } - - - } catch (SQLException e) { - Server.error("SQL Exception Loading " + DataConversions.hashToUsername(user) + ": " + e.getMessage()); - } - - return save; - } - private long muted; - private ArrayList bankItems = new ArrayList(); - private boolean blockChat, blockPrivate, blockTrade, blockDuel; - private boolean cameraAuto, oneMouse, soundOff, showRoof, autoScreenshot, combatWindow; - private int combat, skillTotal; - private byte combatStyle; - private long[] exp = new long[18]; - private int fatigue; - private ArrayList friendList = new ArrayList(); - private byte hairColour, topColour, trouserColour, skinColour, headSprite, bodySprite; - - private ArrayList ignoreList = new ArrayList(); - private ArrayList invItems = new ArrayList(); - private long lastUpdate = 0; - private long loginDate, loginIP; - private int[] lvl = new int[18]; - private boolean male; - private int owner, group; - private int questPoints; - private HashMap questStage = new HashMap(); - private long skulled; - private long subExpires; - private long user; - - private int x, y; - - private PlayerSave(long user) { - this.user = user; - } - - public void addBankItem(int id, int amount) { - bankItems.add(new BankItem(id, amount)); - } - - public void addFriend(long friend) { - friendList.add(friend); - } - - public void addIgnore(long friend) { - ignoreList.add(friend); - } - - public void addInvItem(int id, int amount, boolean wielded) { - invItems.add(new InvItem(id, amount, wielded)); - } - - public boolean autoScreenshot() { - return autoScreenshot; - } - - public boolean blockChat() { - return blockChat; - } - - public boolean blockDuel() { - return blockDuel; - } - - public boolean blockPrivate() { - return blockPrivate; - } - - public boolean blockTrade() { - return blockTrade; - } - - public boolean cameraAuto() { - return cameraAuto; - } - - public void clearBankItems() { - bankItems.clear(); - } - - public void clearInvItems() { - invItems.clear(); - } - - public void clearQuestStages() { - questStage.clear(); - } - - public boolean combatWindow() { - return combatWindow; - } - - public int getBankCount() { - return bankItems.size(); - } - - public BankItem getBankItem(int i) { - return bankItems.get(i); - } - - public int getBodySprite() { - return bodySprite; - } - - public byte getCombatStyle() { - return combatStyle; - } - - public long getExp(int i) { - return exp[i]; - } - - public int getFatigue() { - return fatigue; - } - - public long getFriend(int i) { - return friendList.get(i); - } - - public int getFriendCount() { - return friendList.size(); - } - - public int getGroup() { - return group; - } - - public int getHairColour() { - return hairColour; - } - - public int getHeadSprite() { - return headSprite; - } - - public long getIgnore(int i) { - return ignoreList.get(i); - } - - public int getIgnoreCount() { - return ignoreList.size(); - } - - public int getInvCount() { - return invItems.size(); - } - - public InvItem getInvItem(int i) { - return invItems.get(i); - } - - public long getLastIP() { - return loginIP; - } - - public long getLastLogin() { - return loginDate; - } - - public long getLastUpdate() { - return lastUpdate; - } - - public int getOwner() { - return owner; - } - - public int getQuestPoints() { - return questPoints; - } - - public int getQuestStage(int id) { - return questStage.get(id); - } - - public HashMap getQuestStages() { - return questStage; - } - - public int getSkinColour() { - return skinColour; - } - - public long getSkullTime() { - return skulled; - } - - public int getStat(int i) { - return lvl[i]; - } - - public long getSubscriptionExpires() { - return subExpires; - } - - public int getTopColour() { - return topColour; - } - - public int getTrouserColour() { - return trouserColour; - } - - public long getUser() { - return user; - } - - public String getUsername() { - return DataConversions.hashToUsername(user); - } - - public int getX() { - return x; - } - - public int getY() { - return y; - } - - public boolean isMale() { - return male; - } - - public boolean oneMouse() { - return oneMouse; - } - - public void removeFriend(long friend) { - friendList.remove(friend); - } - - public void removeIgnore(long friend) { - ignoreList.remove(friend); - } - - public boolean save() { - try { - String query; - - Server.db.updateQuery("DELETE FROM `rsca2_bank` WHERE `user`='" + user + "'"); - if (bankItems.size() > 0) { - query = "INSERT INTO `rsca2_bank`(`user`, `id`, `amount`, `slot`) VALUES"; - int slot = 0; - for (BankItem item : bankItems) { - query += "('" + user + "', '" + item.getID() + "', '" + item.getAmount() + "', '" + (slot++) + "'),"; - } - Server.db.updateQuery(query.substring(0, query.length() - 1)); - } - - Server.db.updateQuery("DELETE FROM `rsca2_invitems` WHERE `user`='" + user + "'"); - - ResultSet result = Server.db.getQuery("Select 1 FROM `rsca2_players` WHERE `user`='" + user + "' AND `owner`='" + owner + "'"); - if (!result.next()) - return false; - - Server.db.updateQuery("UPDATE `rsca2_players` SET `combat`=" + combat + ", skill_total=" + skillTotal + ", `x`=" + x + ", `y`='" + y + "', `fatigue`='" + fatigue + "', `haircolour`=" + hairColour + ", `topcolour`=" + topColour + ", `trousercolour`=" + trouserColour + ", `skincolour`=" + skinColour + ", `headsprite`=" + headSprite + ", `bodysprite`=" + bodySprite + ", `male`=" + (male ? 1 : 0) + ", `skulled`=" + skulled + ", `combatstyle`=" + combatStyle + ", `quest_points`=" + questPoints + " WHERE `user`='" + user + "'"); - - query = "UPDATE `rsca2_experience` SET "; - for (int i = 0; i < 18; i++) - query += "`exp_" + statArray[i] + "`=" + exp[i] + ","; - - Server.db.updateQuery(query.substring(0, query.length() - 1) + " WHERE `user`='" + user + "'"); - - query = "UPDATE `rsca2_curstats` SET "; - for (int i = 0; i < 18; i++) - query += "`cur_" + statArray[i] + "`=" + lvl[i] + ","; - - Server.db.updateQuery(query.substring(0, query.length() - 1) + " WHERE `user`='" + user + "'"); - - if (invItems.size() > 0) { - query = "INSERT INTO `rsca2_invitems`(`user`, `id`, `amount`, `wielded`, `slot`) VALUES"; - int slot = 0; - for (InvItem item : invItems) - query += "('" + user + "', '" + item.getID() + "', '" + item.getAmount() + "', '" + (item.isWielded() ? 1 : 0) + "', '" + (slot++) + "'),"; - - Server.db.updateQuery(query.substring(0, query.length() - 1)); - } - - Server.db.updateQuery("DELETE FROM `rsca2_quests` WHERE `user`='" + user + "'"); - query = "INSERT INTO `rsca2_quests` (`user`, `id`, `stage`) VALUES"; - java.util.Set keys = questStage.keySet(); - for (int id : keys) - query += "('" + user + "', '" + id + "', '" + questStage.get(id) + "'),"; - - Server.db.updateQuery(query.substring(0, query.length() - 1)); - - return true; - } catch (SQLException e) { - Server.error(e); - return false; - } - } - - public void setAppearance(byte hairColour, byte topColour, byte trouserColour, byte skinColour, byte headSprite, byte bodySprite, boolean male, long skulled) { - this.hairColour = hairColour; - this.topColour = topColour; - this.trouserColour = trouserColour; - this.skinColour = skinColour; - this.headSprite = headSprite; - this.bodySprite = bodySprite; - this.male = male; - this.skulled = skulled; - } - - public void setCombatStyle(byte combatStyle) { - this.combatStyle = combatStyle; - } - - public void setExp(int stat, long exp) { - this.exp[stat] = exp; - } - - public void setFatigue(int fatigue) { - this.fatigue = fatigue; - } - - public void setGameSetting(int idx, boolean on) { - switch (idx) { - case 0: - cameraAuto = on; - break; - case 2: - oneMouse = on; - break; - case 3: - soundOff = on; - break; - case 4: - showRoof = on; - break; - case 5: - autoScreenshot = on; - break; - case 6: - combatWindow = on; - break; - } - } - - public void setLastUpdate(long lastUpdate) { - this.lastUpdate = lastUpdate; - } - - public void setLocation(int x, int y) { - this.x = x; - this.y = y; - } - - public void setLogin(long loginDate, long loginIP) { - this.loginDate = loginDate; - this.loginIP = loginIP; - } - - public void setLvl(int stat, int lvl) { - this.lvl[stat] = lvl; - } - - public void setOwner(int owner) { - this.owner = owner; - } - - public void setOwner(int owner, int group, long subExpires) { - this.owner = owner; - this.group = group; - this.subExpires = subExpires; - } - - public void setPrivacy(boolean blockChat, boolean blockPrivate, boolean blockTrade, boolean blockDuel) { - this.blockChat = blockChat; - this.blockPrivate = blockPrivate; - this.blockTrade = blockTrade; - this.blockDuel = blockDuel; - } - - public void setPrivacySetting(int idx, boolean on) { - switch (idx) { - case 0: - blockChat = on; - break; - case 1: - blockPrivate = on; - break; - case 2: - blockTrade = on; - break; - case 3: - blockDuel = on; - break; - } - } - - public void setQuestPoints(int i) { - questPoints = i; - } - - public void setQuestStage(int index, int stage) { - questStage.put(index, stage); - } - - public void setSettings(boolean cameraAuto, boolean oneMouse, boolean soundOff, boolean showRoof, boolean autoScreenshot, boolean combatWindow) { - this.cameraAuto = cameraAuto; - this.oneMouse = oneMouse; - this.soundOff = soundOff; - this.showRoof = showRoof; - this.autoScreenshot = autoScreenshot; - this.combatWindow = combatWindow; - } - - public void setStat(int stat, long exp, int lvl) { - this.exp[stat] = exp; - this.lvl[stat] = lvl; - } - - public void setTotals(int combat, int skillTotal) { - this.combat = combat; - this.skillTotal = skillTotal; - } - - public boolean showRoof() { - return showRoof; - } - - public boolean soundOff() { - return soundOff; - } - - public void setMuted(long muted) { - this.muted = muted; - } - - public long getMuted() { - return muted; - } -} diff --git a/LoginServer/src/rsca/ls/model/.svn/text-base/World.java.svn-base b/LoginServer/src/rsca/ls/model/.svn/text-base/World.java.svn-base deleted file mode 100644 index 6348920..0000000 --- a/LoginServer/src/rsca/ls/model/.svn/text-base/World.java.svn-base +++ /dev/null @@ -1,122 +0,0 @@ -package rsca.ls.model; - -import java.sql.ResultSet; -import java.util.Collection; -import java.util.TreeMap; -import java.util.Map.Entry; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.packetbuilder.loginserver.MiscPacketBuilder; -import rsca.ls.util.DataConversions; - -public class World { - private MiscPacketBuilder actionSender = new MiscPacketBuilder(); - private int id = -1; - private TreeMap players = new TreeMap(); - private TreeMap saves = new TreeMap(); - private IoSession session; - - public World(int id, IoSession session) { - this.id = id; - setSession(session); - } - - public void assosiateSave(PlayerSave save) { - saves.put(save.getUser(), save); - } - - public void clearPlayers() { - for (Entry player : getPlayers()) { - long user = player.getKey(); - for (World w : Server.getServer().getWorlds()) { - w.getActionSender().friendLogout(user); - } - System.out.println("Removed " + DataConversions.hashToUsername(user) + " from world " + id); - } - players.clear(); - } - - public MiscPacketBuilder getActionSender() { - return actionSender; - } - - public Collection> getAssosiatedSaves() { - return saves.entrySet(); - } - - public int getID() { - return id; - } - - public Collection> getPlayers() { - return players.entrySet(); - } - - public PlayerSave getSave(long user) { - return saves.get(user); - } - - public IoSession getSession() { - return session; - } - - public boolean hasPlayer(long user) { - return players.containsKey(user); - } - - public void registerPlayer(long user, String ip) { - Server server = Server.getServer(); - ResultSet result; - try { - result = Server.db.getQuery("SELECT owner, block_private FROM `rsca2_players` WHERE `user`='" + user + "'"); - if (!result.next()) { - return; - } - int owner = result.getInt("owner"); - boolean blockPrivate = result.getInt("block_private") == 1; - - result = Server.db.getQuery("SELECT user FROM `rsca2_friends` WHERE `friend`='" + user + "'" + (blockPrivate ? " AND user IN (SELECT friend FROM `rsca2_friends` WHERE `user`='" + user + "')" : "")); - while (result.next()) { - long friend = result.getLong("user"); - World w = server.findWorld(friend); - if (w != null) { - w.getActionSender().friendLogin(friend, user, id); - } - } - long now = (int) (System.currentTimeMillis() / 1000); - Server.db.updateQuery("INSERT INTO `rsca2_logins`(`user`, `time`, `ip`) VALUES('" + user + "', '" + now + "', '" + ip + "')"); - Server.db.updateQuery("UPDATE `rsca2_players` SET login_date=" + now + ", login_ip='" + ip + "' WHERE user='" + user + "'"); - - players.put(user, owner); - System.out.println("Added " + DataConversions.hashToUsername(user) + " to world " + id); - } catch (Exception e) { - Server.error(e); - } - } - - public void setSession(IoSession session) { - this.session = session; - } - - public void unassosiateSave(PlayerSave save) { - saves.remove(save.getUser()); - } - - public void unregisterPlayer(long user) { - for (World w : Server.getServer().getWorlds()) { - w.getActionSender().friendLogout(user); - } - players.remove(user); - System.out.println("Removed " + DataConversions.hashToUsername(user) + " from world " + id); - - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET online=0 WHERE user='" + user + "'"); - } catch (Exception e) { - Server.error(e); - } - - } - -} diff --git a/LoginServer/src/rsca/ls/net/.svn/entries b/LoginServer/src/rsca/ls/net/.svn/entries deleted file mode 100644 index 6dc1793..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/entries +++ /dev/null @@ -1,266 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/net -svn://localhost - - - -2009-09-05T12:50:46.724777Z -203 -xEnt - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -FConnectionHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -bc3bb503bd00cac88d4dab18247ed033 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2956 - -DatabaseConnection.java -file - - - - -2009-10-23T16:32:26.000000Z -8ed2bf87d3cbdf31b56685606c5c6877 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2834 - -LSPacket.java -file - - - - -2009-10-23T16:32:26.000000Z -53ae68299a4e40648108bac714cfc35b -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1050 - -Packet.java -file - - - - -2009-10-23T16:32:26.000000Z -7aa3dd51f57c50639a494e51a3bfc51b -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -6510 - -LSConnectionHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -aa8c591e793c79116dc4ba37b677be3c -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -3218 - -PacketQueue.java -file - - - - -2009-10-23T16:32:26.000000Z -0688a000d769fddc0cd47cdbb70cd61e -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -858 - -FPacket.java -file - - - - -2009-10-23T16:32:26.000000Z -38fe010f331ebf2da24bed71ecba5f3a -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1255 - diff --git a/LoginServer/src/rsca/ls/net/.svn/format b/LoginServer/src/rsca/ls/net/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/net/.svn/text-base/DatabaseConnection.java.svn-base b/LoginServer/src/rsca/ls/net/.svn/text-base/DatabaseConnection.java.svn-base deleted file mode 100644 index fe7a7e8..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/text-base/DatabaseConnection.java.svn-base +++ /dev/null @@ -1,122 +0,0 @@ -package rsca.ls.net; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import rsca.ls.Server; -import rsca.ls.util.Config; - -/** - * Used to interact with the database. - */ -public class DatabaseConnection { - static { - testForDriver(); - } - - /** - * Tests we have a mysql Driver - */ - private static void testForDriver() { - try { - Class.forName("com.mysql.jdbc.Driver"); - } catch (ClassNotFoundException cnfe) { - Server.error(cnfe); - } - } - - /** - * The database connection in use - */ - private Connection con; - - /** - * The last query being executed - */ - private String lastQuery; - - /** - * A statement for running queries on - */ - private Statement statement; - - /** - * Instantiates a new database connection - */ - public DatabaseConnection() { - if (!createConnection()) { - Server.error(new Exception("Unable to connect to MySQL")); - } - } - - /** - * Closes the database conection. - * - * @throws SQLException - * if there was an error when closing the connection - */ - public void close() throws SQLException { - con.close(); - con = null; - } - - public boolean createConnection() { - try { - con = DriverManager.getConnection("jdbc:mysql://" + Config.MYSQL_HOST + "/" + Config.MYSQL_DB, Config.MYSQL_USER, Config.MYSQL_PASS); - statement = con.createStatement(); - statement.setEscapeProcessing(true); - return isConnected(); - } catch (SQLException e) { - Server.error(e.getMessage()); - return false; - } - } - - /** - * Runs a select query on the current database connection - * - * @param s - * The query to be ran - */ - public synchronized ResultSet getQuery(String q) throws SQLException { - try { - lastQuery = q; - return statement.executeQuery(q); - } catch (SQLException e) { - if (!isConnected() && createConnection()) { - return getQuery(q); - } - throw new SQLException(e.getMessage() + ": '" + lastQuery + "'", e.getSQLState(), e.getErrorCode()); - } - } - - public boolean isConnected() { - try { - statement.executeQuery("SELECT CURRENT_DATE"); - return true; - } catch (SQLException e) { - return false; - } - } - - /** - * Runs a update/insert/replace query on the current database connection - * - * @param s - * The query to be ran - */ - public synchronized int updateQuery(String q) throws SQLException { - try { - lastQuery = q; - return statement.executeUpdate(q); - } catch (SQLException e) { - if (!isConnected() && createConnection()) { - return updateQuery(q); - } - throw new SQLException(e.getMessage() + ": '" + lastQuery + "'", e.getSQLState(), e.getErrorCode()); - } - } -} diff --git a/LoginServer/src/rsca/ls/net/.svn/text-base/FConnectionHandler.java.svn-base b/LoginServer/src/rsca/ls/net/.svn/text-base/FConnectionHandler.java.svn-base deleted file mode 100644 index a3b0750..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/text-base/FConnectionHandler.java.svn-base +++ /dev/null @@ -1,109 +0,0 @@ -package rsca.ls.net; - -import org.apache.mina.common.IdleStatus; -import org.apache.mina.common.IoHandler; -import org.apache.mina.common.IoSession; -import org.apache.mina.filter.codec.ProtocolCodecFilter; - -import rsca.ls.LoginEngine; -import rsca.ls.codec.FCodecFactory; - -/** - * Handles the protocol events fired from MINA. - */ -public class FConnectionHandler implements IoHandler { - /** - * A reference to the login engine - */ - private LoginEngine engine; - - /** - * Creates a new connection handler for the given login engine. - * - * @param engine - * The engine in use - */ - public FConnectionHandler(LoginEngine engine) { - this.engine = engine; - } - - /** - * Invoked whenever an exception is thrown by MINA or this IoHandler. - * - * @param session - * The associated session - * @param cause - * The exception thrown - */ - public void exceptionCaught(IoSession session, Throwable cause) { - } - - /** - * Invoked whenever a packet is ready to be added to the queue. - * - * @param session - * The IO session on which the packet was received - * @param message - * The packet - */ - public void messageReceived(IoSession session, Object message) { - if (session.isClosing()) { - return; - } - engine.getFPacketQueue().add((FPacket) message); - } - - /** - * Invoked whenever a packet is sent. - * - * @param session - * The associated session - * @param message - * The packet sent - */ - public void messageSent(IoSession session, Object message) { - session.close(); - } - - /** - * Invoked whenever an IO session is closed. This must handle unregistering - * the disconnecting world from the engine. - * - * @param session - * The IO session which has been closed - */ - public void sessionClosed(IoSession session) { - } - - /** - * Invoked whenever an IO session is created. - * - * @param session - * The session opened - */ - public void sessionCreated(IoSession session) { - session.getFilterChain().addFirst("protocolFilter", new ProtocolCodecFilter(new FCodecFactory())); - // System.out.println("Connection from: " + - // ((InetSocketAddress)session.getRemoteAddress()).getAddress().getHostAddress()); - } - - /** - * Invoked when the idle status of a session changes. - * - * @param session - * The session in question - * @param status - * The new idle status - */ - public void sessionIdle(IoSession session, IdleStatus status) { - } - - /** - * Invoked when a new session is opened. - * - * @param session - * The session opened - */ - public void sessionOpened(IoSession session) { - } -} diff --git a/LoginServer/src/rsca/ls/net/.svn/text-base/FPacket.java.svn-base b/LoginServer/src/rsca/ls/net/.svn/text-base/FPacket.java.svn-base deleted file mode 100644 index d4bc770..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/text-base/FPacket.java.svn-base +++ /dev/null @@ -1,62 +0,0 @@ -package rsca.ls.net; - -import org.apache.mina.common.IoSession; - -/** - * An immutable packet object. - */ -public final class FPacket extends Packet { - /** - * The headers of the packet - */ - private String[] parameters; - /** - * The ID of the packet - */ - private int pID; - - public FPacket(IoSession session, int pID, String[] parameters) { - this(session, pID, parameters, false); - } - - public FPacket(IoSession session, int pID, String[] parameters, boolean bare) { - super(session, new byte[0], bare); - this.pID = pID; - this.parameters = parameters; - } - - /** - * Returns the amount of parameters - */ - public int countParameters() { - return parameters.length; - } - - /** - * Returns the packet ID. - * - * @return The packet ID - */ - public int getID() { - return pID; - } - - /** - * Returns the parameter list. - * - * @return The parameter list - */ - public String[] getParameters() { - return parameters; - } - - /** - * Returns this packet in string form. - * - * @return A String representing this packet - */ - public String toString() { - return super.toString() + " pid = " + pID + " parameter count = " + parameters.length; - } - -} diff --git a/LoginServer/src/rsca/ls/net/.svn/text-base/LSConnectionHandler.java.svn-base b/LoginServer/src/rsca/ls/net/.svn/text-base/LSConnectionHandler.java.svn-base deleted file mode 100644 index 3ed45b7..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/text-base/LSConnectionHandler.java.svn-base +++ /dev/null @@ -1,116 +0,0 @@ -package rsca.ls.net; - -import org.apache.mina.common.IdleStatus; -import org.apache.mina.common.IoHandler; -import org.apache.mina.common.IoSession; -import org.apache.mina.filter.codec.ProtocolCodecFilter; - -import rsca.ls.LoginEngine; -import rsca.ls.Server; -import rsca.ls.codec.LSCodecFactory; -import rsca.ls.model.World; - -/** - * Handles the protocol events fired from MINA. - */ -public class LSConnectionHandler implements IoHandler { - /** - * A reference to the login engine - */ - private LoginEngine engine; - - /** - * Creates a new connection handler for the given login engine. - * - * @param engine - * The engine in use - */ - public LSConnectionHandler(LoginEngine engine) { - this.engine = engine; - } - - /** - * Invoked whenever an exception is thrown by MINA or this IoHandler. - * - * @param session - * The associated session - * @param cause - * The exception thrown - */ - public void exceptionCaught(IoSession session, Throwable cause) { - } - - /** - * Invoked whenever a packet is ready to be added to the queue. - * - * @param session - * The IO session on which the packet was received - * @param message - * The packet - */ - public void messageReceived(IoSession session, Object message) { - if (session.isClosing()) { - return; - } - engine.getLSPacketQueue().add((LSPacket) message); - } - - /** - * Invoked whenever a packet is sent. - * - * @param session - * The associated session - * @param message - * The packet sent - */ - public void messageSent(IoSession session, Object message) { - } - - /** - * Invoked whenever an IO session is closed. This must handle unregistering - * the disconnecting world from the engine. - * - * @param session - * The IO session which has been closed - */ - public void sessionClosed(IoSession session) { - World world = (World) session.getAttachment(); - if (world != null) { - Server.getServer().setIdle(world, true); - world.clearPlayers(); - Server.error("Connection to world " + world.getID() + " lost!"); - } - } - - /** - * Invoked whenever an IO session is created. - * - * @param session - * The session opened - */ - public void sessionCreated(IoSession session) { - session.getFilterChain().addFirst("protocolFilter", new ProtocolCodecFilter(new LSCodecFactory())); - // System.out.println("Connection from: " + - // ((InetSocketAddress)session.getRemoteAddress()).getAddress().getHostAddress()); - } - - /** - * Invoked when the idle status of a session changes. - * - * @param session - * The session in question - * @param status - * The new idle status - */ - public void sessionIdle(IoSession session, IdleStatus status) { - } - - /** - * Invoked when a new session is opened. - * - * @param session - * The session opened - */ - public void sessionOpened(IoSession session) { - } -} diff --git a/LoginServer/src/rsca/ls/net/.svn/text-base/LSPacket.java.svn-base b/LoginServer/src/rsca/ls/net/.svn/text-base/LSPacket.java.svn-base deleted file mode 100644 index e286579..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/text-base/LSPacket.java.svn-base +++ /dev/null @@ -1,55 +0,0 @@ -package rsca.ls.net; - -import org.apache.mina.common.IoSession; - -/** - * An immutable packet object. - */ -public final class LSPacket extends Packet { - /** - * The ID of the packet - */ - private int pID; - /** - * The uID of the packet - */ - private long uID; - - public LSPacket(IoSession session, int pID, long uID, byte[] pData) { - this(session, pID, uID, pData, false); - } - - public LSPacket(IoSession session, int pID, long uID, byte[] pData, boolean bare) { - super(session, pData, bare); - this.pID = pID; - this.uID = uID; - } - - /** - * Returns the packet ID. - * - * @return The packet ID - */ - public int getID() { - return pID; - } - - /** - * Returns the unique ID. - * - * @return The unique ID - */ - public long getUID() { - return uID; - } - - /** - * Returns this packet in string form. - * - * @return A String representing this packet - */ - public String toString() { - return super.toString() + " pid = " + pID + " uid = " + uID; - } - -} diff --git a/LoginServer/src/rsca/ls/net/.svn/text-base/Packet.java.svn-base b/LoginServer/src/rsca/ls/net/.svn/text-base/Packet.java.svn-base deleted file mode 100644 index ea3f10a..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/text-base/Packet.java.svn-base +++ /dev/null @@ -1,257 +0,0 @@ -package rsca.ls.net; - -import java.net.InetSocketAddress; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; - -/** - * An immutable packet object. - */ -public class Packet { - /** - * Whether this packet is without the standard packet header - */ - protected boolean bare; - /** - * The current index into the payload buffer for reading - */ - protected int caret = 0; - /** - * The payload - */ - protected byte[] pData; - /** - * The length of the payload - */ - protected int pLength; - /** - * The associated IO session - */ - protected IoSession session; - /** - * The time this packet was created - */ - protected long time; - - /** - * Creates a new packet with the specified parameters. The packet is - * considered not to be a bare packet. - * - * @param session - * The session to associate with the packet - * @param pData - * The payload the packet - */ - public Packet(IoSession session, byte[] pData) { - this(session, pData, false); - } - - /** - * Creates a new packet with the specified parameters. - * - * @param session - * The session to associate with the packet - * @param pData - * The payload of the packet - * @param bare - * Whether this packet is bare, which means that it does not - * include the standard packet header - */ - public Packet(IoSession session, byte[] pData, boolean bare) { - this.session = session; - this.pData = pData; - this.pLength = pData.length; - this.bare = bare; - time = System.currentTimeMillis(); - } - - /** - * Returns the time the packet was created. - * - * @ return the time the packet was created - */ - public long getCreated() { - return time; - } - - /** - * Returns the entire payload data of this packet. - * - * @return The payload byte array - */ - public byte[] getData() { - return pData; - } - - /** - * Returns the length of the payload of this packet. - * - * @return The length of the packet's payload - */ - public int getLength() { - return pLength; - } - - /** - * Returns the remaining payload data of this packet. - * - * @return The payload byte array - */ - public byte[] getRemainingData() { - byte[] data = new byte[pLength - caret]; - for (int i = 0; i < data.length; i++) { - data[i] = pData[i + caret]; - } - caret += data.length; - return data; - - } - - /** - * Returns the IO session associated with the packet, if any. - * - * @return The IoSession object, or null if none. - */ - public IoSession getSession() { - return session; - } - - /** - * Checks if this packet is considered to be a bare packet, which means that - * it does not include the standard packet header (ID and length values). - * - * @return Whether this packet is a bare packet - */ - public boolean isBare() { - return bare; - } - - public String printData() { - if (pLength == 0) { - return ""; - } - String data = ""; - for (int i = 0; i < pLength; i++) { - data += " " + pData[i]; - } - return data.substring(1); - } - - /** - * Reads the next byte from the payload. - * - * @return A byte - */ - public byte readByte() { - return pData[caret++]; - } - - /** - * Returns length of payload data of this packet. - * - * @return The payload byte array - */ - public byte[] readBytes(int length) { - byte[] data = new byte[length]; - try { - for (int i = 0; i < length; i++) { - data[i] = pData[i + caret]; - } - } catch (Exception e) { - Server.error(e.getMessage()); - } - caret += length; - return data; - } - - /** - * Reads the next int from the payload. - * - * @return An int - */ - public int readInt() { - try { - return ((pData[caret++] & 0xff) << 24) | ((pData[caret++] & 0xff) << 16) | ((pData[caret++] & 0xff) << 8) | (pData[caret++] & 0xff); - } catch (Exception e) { - Server.error(e.getMessage()); - return 0; - } - } - - /** - * Reads the next long from the payload. - * - * @return A long - */ - public long readLong() { - try { - return (long) ((long) (pData[caret++] & 0xff) << 56) | ((long) (pData[caret++] & 0xff) << 48) | ((long) (pData[caret++] & 0xff) << 40) | ((long) (pData[caret++] & 0xff) << 32) | ((long) (pData[caret++] & 0xff) << 24) | ((long) (pData[caret++] & 0xff) << 16) | ((long) (pData[caret++] & 0xff) << 8) | ((long) (pData[caret++] & 0xff)); - } catch (Exception e) { - Server.error(e.getMessage()); - return 0; - } - } - - /** - * Reads the next short from the payload. - * - * @return A short - */ - public short readShort() { - try { - return (short) ((short) ((pData[caret++] & 0xff) << 8) | (short) (pData[caret++] & 0xff)); - } catch (Exception e) { - Server.error(e.getMessage()); - return 0; - } - } - - /** - * Reads the string which is formed by the unread portion of the payload. - * - * @return A String - */ - public String readString() { - return readString(pLength - caret); - } - - /** - * Reads a string of the specified length from the payload. - * - * @param length - * The length of the string to be read - * @return A String - */ - public String readString(int length) { - String rv = new String(pData, caret, length); - caret += length; - return rv; - } - - public int remaining() { - return pData.length - caret; - } - - /** - * Skips the specified number of bytes in the payload. - * - * @param x - * The number of bytes to be skipped - */ - public void skip(int x) { - caret += x; - } - - /** - * Returns this packet in string form. - * - * @return A String representing this packet - */ - public String toString() { - String origin = session == null ? "this" : ((InetSocketAddress) session.getRemoteAddress()).getAddress().getHostAddress(); - return "origin = " + origin + " length = " + pLength; - } - -} diff --git a/LoginServer/src/rsca/ls/net/.svn/text-base/PacketQueue.java.svn-base b/LoginServer/src/rsca/ls/net/.svn/text-base/PacketQueue.java.svn-base deleted file mode 100644 index e976355..0000000 --- a/LoginServer/src/rsca/ls/net/.svn/text-base/PacketQueue.java.svn-base +++ /dev/null @@ -1,43 +0,0 @@ -package rsca.ls.net; - -import java.util.ArrayList; -import java.util.List; - -/** - * Synchronized packet queue - */ -public class PacketQueue { - /** - * The list of packets in the queue - */ - private ArrayList packets = new ArrayList(); - - /** - * Adds a packet to the queue - */ - public void add(T p) { - synchronized (packets) { - packets.add(p); - } - } - - /** - * Returns the packets currently in the list and removes them from the - * backing store - */ - public List getPackets() { - List tmpList; - synchronized (packets) { - tmpList = (List) packets.clone(); - packets.clear(); - } - return tmpList; - } - - /** - * Returns if there is packets to process - */ - public boolean hasPackets() { - return !packets.isEmpty(); - } -} diff --git a/LoginServer/src/rsca/ls/packetbuilder/.svn/entries b/LoginServer/src/rsca/ls/packetbuilder/.svn/entries deleted file mode 100644 index b055f3c..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/.svn/entries +++ /dev/null @@ -1,136 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/packetbuilder -svn://localhost - - - -2009-10-02T12:11:17.749143Z -285 -Pets - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -frontend -dir - -loginserver -dir - -FPacketBuilder.java -file - - - - -2009-10-23T16:32:26.000000Z -b4d333c6a581f32a27e5b2dc664cf445 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1024 - -StaticPacketBuilder.java -file - - - - -2009-10-23T16:32:26.000000Z -a85f2bd1cf468b53e16836616def3e06 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -7379 - -LSPacketBuilder.java -file - - - - -2009-10-23T16:32:26.000000Z -1554c1eaec57dd1bb8d138bf0a98be65 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1541 - diff --git a/LoginServer/src/rsca/ls/packetbuilder/.svn/format b/LoginServer/src/rsca/ls/packetbuilder/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/FPacketBuilder.java.svn-base b/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/FPacketBuilder.java.svn-base deleted file mode 100644 index 8b24044..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/FPacketBuilder.java.svn-base +++ /dev/null @@ -1,47 +0,0 @@ -package rsca.ls.packetbuilder; - -import rsca.ls.net.FPacket; - -public class FPacketBuilder extends StaticPacketBuilder { - /** - * The headers of the packet - */ - private String[] parameters = new String[0]; - /** - * ID of the packet - */ - private int pID = 0; - - /** - * Sets the ID for this packet. - * - * @param id - * The ID of the packet - */ - public FPacketBuilder setID(int pID) { - this.pID = pID; - return this; - } - - /** - * Sets the parameters for this packet. - * - * @param id - * The parameters of the packet - */ - public FPacketBuilder setParameters(String[] parameters) { - this.parameters = parameters; - return this; - } - - /** - * Returns a FPacket object for the data contained in this - * builder. - * - * @return A FPacket object - */ - public FPacket toPacket() { - return new FPacket(null, pID, parameters, bare); - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/LSPacketBuilder.java.svn-base b/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/LSPacketBuilder.java.svn-base deleted file mode 100644 index 8c9fde2..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/LSPacketBuilder.java.svn-base +++ /dev/null @@ -1,69 +0,0 @@ -package rsca.ls.packetbuilder; - -import java.util.Random; - -import rsca.ls.LoginEngine; -import rsca.ls.net.LSPacket; -import rsca.ls.packethandler.PacketHandler; - -public class LSPacketBuilder extends StaticPacketBuilder { - /** - * Random generator - */ - private static Random rand = new Random(); - /** - * ID of the packet - */ - private int pID = 0; - /** - * UID of the packet - */ - private long uID = 0; - - /** - * Sets the handler for this packet. - * - * @param handler - * The handler of the packet - */ - public LSPacketBuilder setHandler(LoginEngine engine, PacketHandler handler) { - uID = rand.nextLong(); - engine.setHandler(uID, handler); - return this; - } - - /** - * Sets the ID for this packet. - * - * @param id - * The ID of the packet - */ - public LSPacketBuilder setID(int pID) { - this.pID = pID; - return this; - } - - /** - * Sets the uID for this packet. - * - * @param id - * The uID of the packet - */ - public LSPacketBuilder setUID(long uID) { - this.uID = uID; - return this; - } - - /** - * Returns a LSPacket object for the data contained in this - * builder. - * - * @return A LSPacket object - */ - public LSPacket toPacket() { - byte[] data = new byte[curLength]; - System.arraycopy(payload, 0, data, 0, curLength); - return new LSPacket(null, pID, uID, data, bare); - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/StaticPacketBuilder.java.svn-base b/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/StaticPacketBuilder.java.svn-base deleted file mode 100644 index 2c6c8b4..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/.svn/text-base/StaticPacketBuilder.java.svn-base +++ /dev/null @@ -1,254 +0,0 @@ -package rsca.ls.packetbuilder; - -import rsca.ls.Server; -import rsca.ls.net.Packet; - -/** - * A mutable sequence of bytes used to construct the immutable - * RSCPacket objects. - */ -public class StaticPacketBuilder { - /** - * Bitmasks for addBits() - */ - protected static int bitmasks[] = { 0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff, 0x1ff, 0x3ff, 0x7ff, 0xfff, 0x1fff, 0x3fff, 0x7fff, 0xffff, 0x1ffff, 0x3ffff, 0x7ffff, 0xfffff, 0x1fffff, 0x3fffff, 0x7fffff, 0xffffff, 0x1ffffff, 0x3ffffff, 0x7ffffff, 0xfffffff, 0x1fffffff, 0x3fffffff, 0x7fffffff, -1 }; - /** - * Default capacity - */ - protected static final int DEFAULT_SIZE = 32; - /** - * Whether this packet does not use the standard packet header - */ - protected boolean bare = false; - /** - * Current index into the buffer by bits - */ - protected int bitPosition = 0; - /** - * Current number of bytes used in the buffer - */ - protected int curLength; - - /** - * The payload buffer - */ - protected byte[] payload; - - /** - * Constructs a packet builder with no data and an initial capacity of - * DEFAULT_SIZE. - * - * @see DEFAULT_SIZE - */ - public StaticPacketBuilder() { - this(DEFAULT_SIZE); - } - - /** - * Constructs a packet builder with no data and an initial capacity of - * capacity. - * - * @param capacity - * The initial capacity of the buffer - */ - public StaticPacketBuilder(int capacity) { - payload = new byte[capacity]; - } - - /** - * TODO needs a proper description. - */ - public StaticPacketBuilder addBits(int value, int numBits) { - int bytePos = bitPosition >> 3; - int bitOffset = 8 - (bitPosition & 7); - bitPosition += numBits; - curLength = (bitPosition + 7) / 8; - ensureCapacity(curLength); - for (; numBits > bitOffset; bitOffset = 8) { - payload[bytePos] &= ~bitmasks[bitOffset]; // mask out the desired - // area - payload[bytePos++] |= (value >> (numBits - bitOffset)) & bitmasks[bitOffset]; - - numBits -= bitOffset; - } - if (numBits == bitOffset) { - payload[bytePos] &= ~bitmasks[bitOffset]; - payload[bytePos] |= value & bitmasks[bitOffset]; - } else { - payload[bytePos] &= ~(bitmasks[numBits] << (bitOffset - numBits)); - payload[bytePos] |= (value & bitmasks[numBits]) << (bitOffset - numBits); - } - return this; - } - - /** - * Adds a byte to the data buffer. The size of this packet will - * grow by one byte. - * - * @param val - * The byte value to add - * @return A reference to this object - */ - public StaticPacketBuilder addByte(byte val) { - return addByte(val, true); - } - - /** - * Adds a byte to the data buffer. The size of this packet will - * grow by one byte. - * - * @param val - * The byte value to add - * @param checkCapacity - * Whether the buffer capacity should be checked - * @return A reference to this object - */ - private StaticPacketBuilder addByte(byte val, boolean checkCapacity) { - if (checkCapacity) - ensureCapacity(curLength + 1); - payload[curLength++] = val; - return this; - } - - /** - * Adds the contents of byte array data to the - * packet. The size of this packet will grow by the length of the provided - * array. - * - * @param data - * The bytes to add to this packet - * @return A reference to this object - */ - public StaticPacketBuilder addBytes(byte[] data) { - return addBytes(data, 0, data.length); - } - - /** - * Adds the contents of byte array data, starting - * at index offset. The size of this packet will grow by - * len bytes. - * - * @param data - * The bytes to add to this packet - * @param offset - * The index of the first byte to append - * @param len - * The number of bytes to append - * @return A reference to this object - */ - public StaticPacketBuilder addBytes(byte[] data, int offset, int len) { - int newLength = curLength + len; - ensureCapacity(newLength); - System.arraycopy(data, offset, payload, curLength, len); - curLength = newLength; - return this; - } - - /** - * Adds a int to the data stream. The size of this packet will - * grow by four bytes. - * - * @param val - * The int value to add - * @return A reference to this object - */ - public StaticPacketBuilder addInt(int val) { - ensureCapacity(curLength + 4); - addByte((byte) (val >> 24), false); - addByte((byte) (val >> 16), false); - addByte((byte) (val >> 8), false); - addByte((byte) val, false); - return this; - } - - /** - * Adds a long to the data stream. The size of this packet will - * grow by eight bytes. - * - * @param val - * The long value to add - * @return A reference to this object - */ - public StaticPacketBuilder addLong(long val) { - addInt((int) (val >> 32)); - addInt((int) (val & -1L)); - return this; - } - - /** - * Adds a short to the data stream. The size of this packet - * will grow by two bytes. - * - * @param val - * The short value to add - * @return A reference to this object - */ - public StaticPacketBuilder addShort(int val) { - ensureCapacity(curLength + 2); - addByte((byte) (val >> 8), false); - addByte((byte) val, false); - return this; - } - - /** - * Ensures that the buffer is at least minimumBytes bytes. - * - * @param minimumCapacity - * The size needed - */ - private void ensureCapacity(int minimumCapacity) { - if (minimumCapacity >= payload.length) - expandCapacity(minimumCapacity); - } - - /** - * Expands the buffer to the specified size. - * - * @param minimumCapacity - * The minimum capacity to which to expand - * @see java.lang.AbstractStringBuilder#expandCapacity(int) - */ - private void expandCapacity(int minimumCapacity) { - int newCapacity = (payload.length + 1) * 2; - if (newCapacity < 0) { - newCapacity = Integer.MAX_VALUE; - } else if (minimumCapacity > newCapacity) { - newCapacity = minimumCapacity; - } - int oldLength = curLength; - if (oldLength > payload.length) { - oldLength = payload.length; - } - byte[] newPayload = new byte[newCapacity]; - try { - System.arraycopy(payload, 0, newPayload, 0, oldLength); - } catch (Exception e) { - Server.error(e); - } - payload = newPayload; - } - - /** - * Sets this packet as bare. A bare packet will contain only the payload - * data, rather than having the standard packet header prepended. - * - * @param bare - * Whether this packet is to be sent bare - */ - public StaticPacketBuilder setBare(boolean bare) { - this.bare = bare; - return this; - } - - /** - * Returns a Packet object for the data contained in this - * builder. - * - * @return A Packet object - */ - public Packet toPacket() { - byte[] data = new byte[curLength]; - System.arraycopy(payload, 0, data, 0, curLength); - return new Packet(null, data, bare); - } -} diff --git a/LoginServer/src/rsca/ls/packetbuilder/frontend/.svn/entries b/LoginServer/src/rsca/ls/packetbuilder/frontend/.svn/entries deleted file mode 100644 index 06d16fb..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/frontend/.svn/entries +++ /dev/null @@ -1,28 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/packetbuilder/frontend -svn://localhost - - - -2009-07-02T21:34:35.162152Z -6 -ollie - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - diff --git a/LoginServer/src/rsca/ls/packetbuilder/frontend/.svn/format b/LoginServer/src/rsca/ls/packetbuilder/frontend/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/frontend/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/entries b/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/entries deleted file mode 100644 index e8a0c39..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/entries +++ /dev/null @@ -1,164 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/packetbuilder/loginserver -svn://localhost - - - -2009-10-02T12:11:17.749143Z -285 -Pets - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -PlayerLoginPacketBuilder.java -file - - - - -2009-10-23T16:32:26.000000Z -f1ab3acbf0217f8e0493151ac00a200d -2009-10-02T12:11:17.749143Z -285 -Pets - - - - - - - - - - - - - - - - - - - - - -4546 - -WorldRegisteredPacketBuilder.java -file - - - - -2009-10-23T16:32:26.000000Z -9ae7c147da41c5c9c5bd7ebd25646df9 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -774 - -MiscPacketBuilder.java -file - - - - -2009-10-23T16:32:26.000000Z -ab9db99bfb11be0e63df9467ad59d9aa -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -3345 - -ReplyPacketBuilder.java -file - - - - -2009-10-23T16:32:26.000000Z -4460747f035332d7f86dba32c4ba1b8c -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1003 - diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/format b/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/MiscPacketBuilder.java.svn-base b/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/MiscPacketBuilder.java.svn-base deleted file mode 100644 index 91d9b7d..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/MiscPacketBuilder.java.svn-base +++ /dev/null @@ -1,135 +0,0 @@ -package rsca.ls.packetbuilder.loginserver; - -import java.util.ArrayList; -import java.util.List; - -import rsca.ls.LoginEngine; -import rsca.ls.Server; -import rsca.ls.net.LSPacket; -import rsca.ls.packetbuilder.LSPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class MiscPacketBuilder { - /** - * LoginEngine - */ - private LoginEngine engine = Server.getServer().getEngine(); - /** - * List of packets waiting to be sent to the world - */ - private List packets = new ArrayList(); - - public void alert(long user, String message) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(6); - s.addLong(user); - s.addBytes(message.getBytes()); - packets.add(s.toPacket()); - } - - public void alert(String message) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(5); - s.addBytes(message.getBytes()); - packets.add(s.toPacket()); - } - - /** - * Clears old packets that have already been sent - */ - public void clearPackets() { - packets.clear(); - } - - public void friendLogin(long user, long friend, int w) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(11); - s.addLong(user); - s.addLong(friend); - s.addShort(w); - packets.add(s.toPacket()); - } - - public void friendLogout(long friend) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(12); - s.addLong(friend); - packets.add(s.toPacket()); - } - - public void friendLogout(long user, long friend) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(13); - s.addLong(friend); - s.addLong(user); - packets.add(s.toPacket()); - } - - /** - * Gets a List of new packets since the last update - */ - public List getPackets() { - return packets; - } - - public void logoutUser(long user) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(7); - s.addLong(user); - packets.add(s.toPacket()); - } - - public void playerListRequest(PacketHandler handler) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(2); - s.setHandler(engine, handler); - packets.add(s.toPacket()); - } - - public void requestPlayerInfo(long user, PacketHandler handler) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(9); - s.addLong(user); - s.setHandler(engine, handler); - packets.add(s.toPacket()); - } - - public void requestReportInfo(long user, PacketHandler handler) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(8); - s.addLong(user); - s.setHandler(engine, handler); - packets.add(s.toPacket()); - } - - public void requestStats(PacketHandler handler) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(1); - s.setHandler(engine, handler); - packets.add(s.toPacket()); - } - - public void sendPM(long user, long friend, boolean avoidBlock, byte[] message) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(10); - s.addLong(user); - s.addLong(friend); - s.addByte((byte) (avoidBlock ? 1 : 0)); - s.addBytes(message); - packets.add(s.toPacket()); - } - - public void shutdown() { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(3); - packets.add(s.toPacket()); - } - - public void update(String reason) { - LSPacketBuilder s = new LSPacketBuilder(); - s.setID(4); - s.addBytes(reason.getBytes()); - packets.add(s.toPacket()); - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/PlayerLoginPacketBuilder.java.svn-base b/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/PlayerLoginPacketBuilder.java.svn-base deleted file mode 100644 index c8a787f..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/PlayerLoginPacketBuilder.java.svn-base +++ /dev/null @@ -1,150 +0,0 @@ -package rsca.ls.packetbuilder.loginserver; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; - -import rsca.ls.Server; -import rsca.ls.model.BankItem; -import rsca.ls.model.InvItem; -import rsca.ls.model.PlayerSave; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.packetbuilder.LSPacketBuilder; - -public class PlayerLoginPacketBuilder { - /** - * Players Login Code - */ - private byte loginCode; - /** - * Players Saved Data - */ - private PlayerSave save; - /** - * Packets uID - */ - private long uID; - - public LSPacket getPacket() { - Server server = Server.getServer(); - - LSPacketBuilder packet = new LSPacketBuilder(); - packet.setUID(uID); - packet.addByte(loginCode); - if (save != null) { - packet.addInt(save.getOwner()); - packet.addInt(save.getGroup()); - - packet.addLong(save.getSubscriptionExpires()); - - packet.addLong(save.getLastIP()); - packet.addLong(save.getLastLogin()); - - packet.addShort(save.getX()); - packet.addShort(save.getY()); - - packet.addShort(save.getFatigue()); - packet.addByte(save.getCombatStyle()); - - packet.addByte((byte) (save.blockChat() ? 1 : 0)); - packet.addByte((byte) (save.blockPrivate() ? 1 : 0)); - packet.addByte((byte) (save.blockTrade() ? 1 : 0)); - packet.addByte((byte) (save.blockDuel() ? 1 : 0)); - - packet.addByte((byte) (save.cameraAuto() ? 1 : 0)); - packet.addByte((byte) (save.oneMouse() ? 1 : 0)); - packet.addByte((byte) (save.soundOff() ? 1 : 0)); - packet.addByte((byte) (save.showRoof() ? 1 : 0)); - packet.addByte((byte) (save.autoScreenshot() ? 1 : 0)); - packet.addByte((byte) (save.combatWindow() ? 1 : 0)); - - packet.addShort(save.getHairColour()); - packet.addShort(save.getTopColour()); - packet.addShort(save.getTrouserColour()); - packet.addShort(save.getSkinColour()); - packet.addShort(save.getHeadSprite()); - packet.addShort(save.getBodySprite()); - - packet.addByte((byte) (save.isMale() ? 1 : 0)); - packet.addLong(save.getSkullTime()); - - for (int i = 0; i < 18; i++) { - packet.addLong(save.getExp(i)); - packet.addShort(save.getStat(i)); - } - - int invCount = save.getInvCount(); - packet.addShort(invCount); - for (int i = 0; i < invCount; i++) { - InvItem item = save.getInvItem(i); - packet.addShort(item.getID()); - packet.addInt(item.getAmount()); - packet.addByte((byte) (item.isWielded() ? 1 : 0)); - } - - int bankCount = save.getBankCount(); - packet.addShort(bankCount); - for (int i = 0; i < bankCount; i++) { - BankItem item = save.getBankItem(i); - packet.addShort(item.getID()); - packet.addInt(item.getAmount()); - } - - ArrayList friendsWithUs = new ArrayList(); - try { - ResultSet result = Server.db.getQuery("SELECT p.user FROM `rsca2_friends` AS f INNER JOIN `rsca2_players` AS p ON p.user=f.friend WHERE p.block_private=0 AND f.user='" + save.getUser() + "'"); - while (result.next()) { - friendsWithUs.add(result.getLong("user")); - } - result = Server.db.getQuery("SELECT user FROM `rsca2_friends` WHERE friend='" + save.getUser() + "'"); - while (result.next()) { - friendsWithUs.add(result.getLong("user")); - } - } catch (SQLException e) { - Server.error(e); - } - - int friendCount = save.getFriendCount(); - packet.addShort(friendCount); - for (int i = 0; i < friendCount; i++) { - long friend = save.getFriend(i); - World world = server.findWorld(friend); - packet.addLong(friend); - packet.addShort(world == null || !friendsWithUs.contains(friend) ? 0 : world.getID()); - } - - int ignoreCount = save.getIgnoreCount(); - packet.addShort(ignoreCount); - for (int i = 0; i < ignoreCount; i++) { - packet.addLong(save.getIgnore(i)); - } - packet.addShort(save.getQuestPoints()); - java.util.Set keys = save.getQuestStages().keySet(); - packet.addShort(keys.size()); - - for (int id : keys) { - packet.addShort(id); - packet.addShort(save.getQuestStage(id)); - } - packet.addLong(save.getMuted()); - } - return packet.toPacket(); - - } - - /** - * Sets the packet to reply to - */ - public void setPlayer(PlayerSave save, byte loginCode) { - this.save = save; - this.loginCode = loginCode; - } - - /** - * Sets the packet to reply to - */ - public void setUID(long uID) { - this.uID = uID; - } -} diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/ReplyPacketBuilder.java.svn-base b/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/ReplyPacketBuilder.java.svn-base deleted file mode 100644 index eaf6927..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/ReplyPacketBuilder.java.svn-base +++ /dev/null @@ -1,50 +0,0 @@ -package rsca.ls.packetbuilder.loginserver; - -import rsca.ls.net.LSPacket; -import rsca.ls.packetbuilder.LSPacketBuilder; - -public class ReplyPacketBuilder { - /** - * Reply - */ - private String reply; - /** - * Was the action successful - */ - private boolean success; - /** - * Packets uID - */ - private long uID; - - public LSPacket getPacket() { - LSPacketBuilder packet = new LSPacketBuilder(); - packet.setUID(uID); - packet.addByte((byte) (success ? 1 : 0)); - if (reply != null) { - packet.addBytes(reply.getBytes()); - } - return packet.toPacket(); - } - - /** - * Sets the reply to send back - */ - public void setReply(String reply) { - this.reply = reply; - } - - /** - * Sets the status of the action - */ - public void setSuccess(boolean success) { - this.success = success; - } - - /** - * Sets the packet to reply to - */ - public void setUID(long uID) { - this.uID = uID; - } -} diff --git a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/WorldRegisteredPacketBuilder.java.svn-base b/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/WorldRegisteredPacketBuilder.java.svn-base deleted file mode 100644 index 3a933c4..0000000 --- a/LoginServer/src/rsca/ls/packetbuilder/loginserver/.svn/text-base/WorldRegisteredPacketBuilder.java.svn-base +++ /dev/null @@ -1,36 +0,0 @@ -package rsca.ls.packetbuilder.loginserver; - -import rsca.ls.net.LSPacket; -import rsca.ls.packetbuilder.LSPacketBuilder; - -public class WorldRegisteredPacketBuilder { - /** - * Was the registering successful? - */ - private boolean success; - /** - * Packets uID - */ - private long uID; - - public LSPacket getPacket() { - LSPacketBuilder packet = new LSPacketBuilder(); - packet.setUID(uID); - packet.addByte((byte) (success ? 1 : 0)); - return packet.toPacket(); - } - - /** - * Sets whether or not we were successful - */ - public void setSuccess(boolean success) { - this.success = success; - } - - /** - * Sets the packet to reply to - */ - public void setUID(long uID) { - this.uID = uID; - } -} diff --git a/LoginServer/src/rsca/ls/packethandler/.svn/entries b/LoginServer/src/rsca/ls/packethandler/.svn/entries deleted file mode 100644 index e36e911..0000000 --- a/LoginServer/src/rsca/ls/packethandler/.svn/entries +++ /dev/null @@ -1,102 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/packethandler -svn://localhost - - - -2010-01-10T17:31:45.404426Z -376 -ollie - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -frontend -dir - -loginserver -dir - -PacketHandlerDef.java -file - - - - -2009-10-23T16:32:26.000000Z -1a757edc3ec38fe239238a3d968427db -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1220 - -PacketHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -19b80703e3e9fe4cec879abf32d47fc2 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -222 - diff --git a/LoginServer/src/rsca/ls/packethandler/.svn/format b/LoginServer/src/rsca/ls/packethandler/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/packethandler/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/packethandler/.svn/text-base/PacketHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/.svn/text-base/PacketHandler.java.svn-base deleted file mode 100644 index 7b18cc7..0000000 --- a/LoginServer/src/rsca/ls/packethandler/.svn/text-base/PacketHandler.java.svn-base +++ /dev/null @@ -1,9 +0,0 @@ -package rsca.ls.packethandler; - -import org.apache.mina.common.IoSession; - -import rsca.ls.net.Packet; - -public interface PacketHandler { - public void handlePacket(Packet p, IoSession session) throws Exception; -} diff --git a/LoginServer/src/rsca/ls/packethandler/.svn/text-base/PacketHandlerDef.java.svn-base b/LoginServer/src/rsca/ls/packethandler/.svn/text-base/PacketHandlerDef.java.svn-base deleted file mode 100644 index 9eaca41..0000000 --- a/LoginServer/src/rsca/ls/packethandler/.svn/text-base/PacketHandlerDef.java.svn-base +++ /dev/null @@ -1,48 +0,0 @@ -package rsca.ls.packethandler; - -/** - * The definition of a packet handler, for use with XStream. - */ -public class PacketHandlerDef { - /** - * The name of the handler class - */ - public String className; - /** - * The IDs of packets which the handler is responsible for - */ - public int[] ids; - - /** - * Constructs a new packet handler definition, entailing that packets with - * the given IDs are to be handled by the specified class. - * - * @param ids - * The IDs of packets to be handled - * @param className - * The name of the packet handler class - */ - public PacketHandlerDef(int[] ids, String className) { - this.ids = ids; - this.className = className; - } - - /** - * Returns the IDs of packets to be handled. - * - * @return An int array containing the IDs of packets to be - * handled. - */ - public int[] getAssociatedPackets() { - return ids; - } - - /** - * Returns the name of the packet handler class. - * - * @return The name of the packet handler's class - */ - public String getClassName() { - return className; - } -} diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/entries b/LoginServer/src/rsca/ls/packethandler/frontend/.svn/entries deleted file mode 100644 index 8b25690..0000000 --- a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/entries +++ /dev/null @@ -1,232 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/packethandler/frontend -svn://localhost - - - -2009-09-05T12:50:46.724777Z -203 -xEnt - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -Global.java -file - - - - -2009-10-23T16:32:26.000000Z -4590553751794ebbf3a28e7e299538f9 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -870 - -Update.java -file - - - - -2009-10-23T16:32:26.000000Z -6c33f8c0ee464587290ba212f9dbb477 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -869 - -Alert.java -file - - - - -2009-10-23T16:32:26.000000Z -a98f00dd1572bb473abb3c9492422ebf -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -990 - -Logout.java -file - - - - -2009-10-23T16:32:26.000000Z -4fee267e135f14c818901ac1c6429a5e -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -985 - -ListPlayers.java -file - - - - -2009-10-23T16:32:26.000000Z -8f37d218545b0cec04149969f9951e97 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1497 - -Shutdown.java -file - - - - -2009-10-23T16:32:26.000000Z -8d5477b0b0e2a255521fa6fc58e4fa4f -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1086 - diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/format b/LoginServer/src/rsca/ls/packethandler/frontend/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Alert.java.svn-base b/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Alert.java.svn-base deleted file mode 100644 index 527291e..0000000 --- a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Alert.java.svn-base +++ /dev/null @@ -1,34 +0,0 @@ -package rsca.ls.packethandler.frontend; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class Alert implements PacketHandler { - private static final FPacketBuilder builder = new FPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - String[] params = ((FPacket) p).getParameters(); - try { - long usernameHash = Long.parseLong(params[0]); - World world = Server.getServer().findWorld(usernameHash); - if (world == null) { - throw new Exception("World not found"); - } - world.getActionSender().alert(usernameHash, params[1]); - builder.setID(1); - } catch (Exception e) { - builder.setID(0); - } - FPacket packet = builder.toPacket(); - if (packet != null) { - session.write(packet); - } - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Global.java.svn-base b/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Global.java.svn-base deleted file mode 100644 index f5b5d2a..0000000 --- a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Global.java.svn-base +++ /dev/null @@ -1,32 +0,0 @@ -package rsca.ls.packethandler.frontend; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class Global implements PacketHandler { - private static final FPacketBuilder builder = new FPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - String[] params = ((FPacket) p).getParameters(); - try { - String message = params[0]; - for (World w : Server.getServer().getWorlds()) { - w.getActionSender().alert(message); - } - builder.setID(1); - } catch (Exception e) { - builder.setID(0); - } - FPacket packet = builder.toPacket(); - if (packet != null) { - session.write(packet); - } - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/ListPlayers.java.svn-base b/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/ListPlayers.java.svn-base deleted file mode 100644 index c24df1e..0000000 --- a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/ListPlayers.java.svn-base +++ /dev/null @@ -1,46 +0,0 @@ -package rsca.ls.packethandler.frontend; - -import java.util.ArrayList; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class ListPlayers implements PacketHandler { - private static final FPacketBuilder builder = new FPacketBuilder(); - - public void handlePacket(Packet p, final IoSession session) throws Exception { - String[] params = ((FPacket) p).getParameters(); - try { - final int worldID = Integer.parseInt(params[0]); - System.out.println("Frontend requested player list for world " + worldID); - World world = Server.getServer().getWorld(worldID); - if (world == null) { - throw new Exception("Unknown world"); - } - world.getActionSender().playerListRequest(new PacketHandler() { - public void handlePacket(Packet p, IoSession s) throws Exception { - builder.setID(1); - - ArrayList params = new ArrayList(); - int count = p.readInt(); - for (int c = 0; c < count; c++) { - params.add(p.readLong() + "," + p.readShort() + "," + p.readShort() + "," + worldID); - } - builder.setParameters(params.toArray(new String[params.size()])); - - session.write(builder.toPacket()); - } - }); - } catch (Exception e) { - builder.setID(0); - session.write(builder.toPacket()); - } - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Logout.java.svn-base b/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Logout.java.svn-base deleted file mode 100644 index 2062036..0000000 --- a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Logout.java.svn-base +++ /dev/null @@ -1,34 +0,0 @@ -package rsca.ls.packethandler.frontend; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class Logout implements PacketHandler { - private static final FPacketBuilder builder = new FPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - String[] params = ((FPacket) p).getParameters(); - try { - long usernameHash = Long.parseLong(params[0]); - World world = Server.getServer().findWorld(usernameHash); - if (world == null) { - throw new Exception("World not found"); - } - world.getActionSender().logoutUser(usernameHash); - builder.setID(1); - } catch (Exception e) { - builder.setID(0); - } - FPacket packet = builder.toPacket(); - if (packet != null) { - session.write(packet); - } - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Shutdown.java.svn-base b/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Shutdown.java.svn-base deleted file mode 100644 index e4a4e12..0000000 --- a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Shutdown.java.svn-base +++ /dev/null @@ -1,40 +0,0 @@ -package rsca.ls.packethandler.frontend; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class Shutdown implements PacketHandler { - private static final FPacketBuilder builder = new FPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - String[] params = ((FPacket) p).getParameters(); - try { - int worldID = Integer.parseInt(params[0]); - if (worldID == 0) { - for (World w : Server.getServer().getWorlds()) { - w.getActionSender().shutdown(); - } - } else { - World w = Server.getServer().getWorld(worldID); - if (w == null) { - throw new Exception("Unknown world"); - } - w.getActionSender().shutdown(); - } - builder.setID(1); - } catch (Exception e) { - builder.setID(0); - } - FPacket packet = builder.toPacket(); - if (packet != null) { - session.write(packet); - } - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Update.java.svn-base b/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Update.java.svn-base deleted file mode 100644 index a1399fe..0000000 --- a/LoginServer/src/rsca/ls/packethandler/frontend/.svn/text-base/Update.java.svn-base +++ /dev/null @@ -1,32 +0,0 @@ -package rsca.ls.packethandler.frontend; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.FPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.FPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class Update implements PacketHandler { - private static final FPacketBuilder builder = new FPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - String[] params = ((FPacket) p).getParameters(); - try { - String reason = params[0]; - for (World w : Server.getServer().getWorlds()) { - w.getActionSender().update(reason); - } - builder.setID(1); - } catch (Exception e) { - builder.setID(0); - } - FPacket packet = builder.toPacket(); - if (packet != null) { - session.write(packet); - } - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/entries b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/entries deleted file mode 100644 index 7f06312..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/entries +++ /dev/null @@ -1,606 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/packethandler/loginserver -svn://localhost - - - -2010-01-10T17:31:45.404426Z -376 -ollie - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -Tradelog.java -file - - - - -2010-01-10T17:31:29.000000Z -4539e08b2453fe707fa4085fbe82f5b4 -2010-01-10T17:31:45.404426Z -376 -ollie - - - - - - - - - - - - - - - - - - - - - -713 - -GameSettingHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -2fc1f0a86599befc1c8d355885db7327 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2063 - -FriendHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -692756abc7c26103cbbe9851be78e4b0 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2998 - -SaveProfilesRequestHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -5d34a09bc3fa60049699912e25e493fe -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1242 - -ReportHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -8b61c3334bcc7e0a1e6774097b17ea80 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1149 - -PrivacySettingHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -92c26cf5038190ed8af5b3742ccf80d3 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2150 - -PlayerSaveHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -2bea6ce9cb05d425e742e9868d971cbd -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2066 - -PlayerInfoRequestHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -16026ccfbe16de107c337a9a44a2c56f -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1265 - -LogHandler.java -file - - - - -2010-01-09T00:16:19.000000Z -b47a62fa98c3490bd7259ecf984b2fbf -2010-01-09T00:16:07.709894Z -372 -Pets - - - - - - - - - - - - - - - - - - - - - -1570 - -PlayerLoginHandler.java.1 -file - - - - -2009-10-23T16:32:26.000000Z -b153ee3c05b597e98dbdf80596740e36 -2009-07-02T21:34:35.162152Z -6 -ollie - - - - - - - - - - - - - - - - - - - - - -3152 - -PlayerLoginHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -451dab8b28d4e6f2faa3c84329658c55 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -3739 - -PlayerLogoutHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -5c5de57b46cc82283a2ce47027713994 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -454 - -KillHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -6d039cc6b58732a0aa9d4357801e4014 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -655 - -RegisterWorld.java -file - - - - -2009-10-23T16:32:26.000000Z -1b7843295a154da2a144aa6449bfb028 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2095 - -BanHandler.java.autothread -file - - - - -2009-10-23T16:32:26.000000Z -430c715dcf6de682e81e06cec91cd3e5 -2009-07-02T21:34:35.162152Z -6 -ollie - - - - - - - - - - - - - - - - - - - - - -3432 - -BanHandler.java.2 -file - - - - -2009-10-23T16:32:26.000000Z -08ea47511ab44f81ce2a7705b1d00f80 -2009-07-02T21:34:35.162152Z -6 -ollie - - - - - - - - - - - - - - - - - - - - - -2221 - -BanHandler.java -file - - - - -2009-10-23T16:32:26.000000Z -9ceb76e90ec54ea168f61048a72da703 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -2038 - diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/format b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.2.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.2.svn-base deleted file mode 100644 index 9e4ac26..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.2.svn-base +++ /dev/null @@ -1,55 +0,0 @@ -package org.rscdaemon.ls.packethandler.loginserver; - -import org.rscdaemon.ls.packethandler.PacketHandler; -import org.rscdaemon.ls.Server; -import org.rscdaemon.ls.model.World; -import org.rscdaemon.ls.net.LSPacket; -import org.rscdaemon.ls.net.Packet; -import org.rscdaemon.ls.util.DataConversions; -import org.rscdaemon.ls.packetbuilder.loginserver.ReplyPacketBuilder; - -import org.apache.mina.common.IoSession; - -import java.sql.ResultSet; - -public class BanHandler implements PacketHandler { - private ReplyPacketBuilder builder = new ReplyPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - final long uID = ((LSPacket)p).getUID(); - boolean banned = ((LSPacket)p).getID() == 4; - long user = p.readLong(); - long modhash = p.readLong(); - - ResultSet result = Server.db.getQuery("SELECT u.group_id, p.playermod, p.owner FROM `users` AS u INNER JOIN `rscd_players` AS p ON p.owner=u.id WHERE p.user=" + user); - if(!result.next()) { - builder.setSuccess(false); - builder.setReply("There is not an account by that username"); - } - else if(banned && (result.getInt("group_id") < 3 || result.getInt("playermod") == 1)) { - builder.setSuccess(false); - builder.setReply("You cannot ban a (p)mod or admin!"); - } - else if(Server.db.updateQuery("UPDATE `rscd_players` SET `banned`='" + (banned ? "1" : "0") + "' WHERE `user` LIKE '" + user + "'") == 0) { - builder.setSuccess(false); - builder.setReply("There is not an account by that username"); - } - else { - World w = Server.getServer().findWorld(user); - if(w != null) { - w.getActionSender().logoutUser(user); - } - if(banned) Server.db.updateQuery("INSERT `rscd_banlog` VALUES('" + user + "','" + modhash + "','" + (System.currentTimeMillis() / 1000) + "')"); - builder.setSuccess(true); - builder.setReply(DataConversions.hashToUsername(user) + " has been " + (banned ? "banned" : "unbanned")); - } - builder.setUID(uID); - - LSPacket temp = builder.getPacket(); - if(temp != null) { - session.write(temp); - } - - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.autothread.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.autothread.svn-base deleted file mode 100644 index 8d11aa5..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.autothread.svn-base +++ /dev/null @@ -1,68 +0,0 @@ -package org.rscdaemon.ls.packethandler.loginserver; - -import org.rscdaemon.ls.packethandler.PacketHandler; -import org.rscdaemon.ls.Server; -import org.rscdaemon.ls.model.World; -import org.rscdaemon.ls.net.LSPacket; -import org.rscdaemon.ls.net.Packet; -import org.rscdaemon.ls.util.DataConversions; -import org.rscdaemon.ls.packetbuilder.loginserver.ReplyPacketBuilder; - -import org.apache.mina.common.IoSession; - -import java.sql.ResultSet; - -public class BanHandler implements PacketHandler { - private ReplyPacketBuilder builder = new ReplyPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - final long uID = ((LSPacket)p).getUID(); - boolean banned = ((LSPacket)p).getID() == 4; - long user = p.readLong(); - long modhash = p.readLong(); - - ResultSet result = Server.db.getQuery("SELECT u.group_id, p.playermod, p.owner FROM `users` AS u INNER JOIN `rscd_players` AS p ON p.owner=u.id WHERE p.user=" + user); - if(!result.next()) { - builder.setSuccess(false); - builder.setReply("There is not an account by that username"); - } - else if(banned && (result.getInt("group_id") < 3 || result.getInt("playermod") == 1)) { - builder.setSuccess(false); - builder.setReply("You cannot ban a (p)mod or admin!"); - } - else if(Server.db.updateQuery("UPDATE `rscd_players` SET `banned`='" + (banned ? "1" : "0") + "' WHERE `user` LIKE '" + user + "'") == 0) { - builder.setSuccess(false); - builder.setReply("There is not an account by that username"); - } - else { - World w = Server.getServer().findWorld(user); - if(w != null) { - w.getActionSender().logoutUser(user); - } - if(banned) { - String owner = result.getString("owner"); - Server.db.updateQuery("INSERT `rscd_banlog` VALUES('" + user + "','" + modhash + "','" + (System.currentTimeMillis() / 1000) + "')"); - ResultSet result2 = Server.db.getQuery("SELECT username FROM `users` WHERE id=" + owner); - - String username = result2.getString("username"); - Server.db.updateQuery("INSERT `topics` (poster, subject, posted, last_post, last_poster, forum_id) VALUES('" + username + "','[" + DataConversions.hashToUsername(user) + "] Banned by [" + DataConversions.hashToUsername(modhash) + "]','" + (System.currentTimeMillis() / 1000) + "','" + (System.currentTimeMillis() / 1000) + "','" + username + "','19')"); - ResultSet result3 = Server.db.getQuery("SELECT LAST_INSERT_ID()"); - String tid = result3.getString(1); - Server.db.updateQuery("INSERT `posts` (poster, poster_ip, poster_email, message, hide_smilies, posted, topic_id) VALUES('" + username + "','0.0.0.0','null@null.org', This thread will close in 24h, post in here if you are the account owner.','1','" + (System.currentTimeMillis() / 1000) + "','" + tid + "')"); - ResultSet result4 = Server.db.getQuery("SELECT LAST_INSERT_ID()"); - String pid = result4.getString(1); - Server.db.updateQuery("UPDATE `posts` SET last_post_id=`" + pid + "` WHERE id=`" + tid + "`"); - } - builder.setSuccess(true); - builder.setReply(DataConversions.hashToUsername(user) + " has been " + (banned ? "banned" : "unbanned")); - } - builder.setUID(uID); - - LSPacket temp = builder.getPacket(); - if(temp != null) { - session.write(temp); - } - - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.svn-base deleted file mode 100644 index 1b20143..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/BanHandler.java.svn-base +++ /dev/null @@ -1,53 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.sql.ResultSet; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.loginserver.ReplyPacketBuilder; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.DataConversions; - -public class BanHandler implements PacketHandler { - private ReplyPacketBuilder builder = new ReplyPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - final long uID = ((LSPacket) p).getUID(); - boolean banned = ((LSPacket) p).getID() == 4; - long user = p.readLong(); - long modhash = p.readLong(); - - ResultSet result = Server.db.getQuery("SELECT u.group_id, p.playermod, p.owner FROM `users` AS u INNER JOIN `rsca2_players` AS p ON p.owner=u.id WHERE p.user='" + user + "'"); - if (!result.next()) { - builder.setSuccess(false); - builder.setReply("There is not an account by that username"); - } else if (banned && (result.getInt("group_id") < 3 || result.getInt("playermod") == 1)) { - builder.setSuccess(false); - builder.setReply("You cannot ban a (p)mod or admin!"); - } else if (Server.db.updateQuery("UPDATE `rsca2_players` SET `banned`='" + (banned ? "1" : "0") + "' WHERE `user` LIKE '" + user + "'") == 0) { - builder.setSuccess(false); - builder.setReply("There is not an account by that username"); - } else { - World w = Server.getServer().findWorld(user); - if (w != null) { - w.getActionSender().logoutUser(user); - } - if (banned) - Server.db.updateQuery("INSERT `rsca2_banlog` VALUES('" + user + "','" + modhash + "','" + (System.currentTimeMillis() / 1000) + "')"); - builder.setSuccess(true); - builder.setReply(DataConversions.hashToUsername(user) + " has been " + (banned ? "banned" : "unbanned")); - } - builder.setUID(uID); - - LSPacket temp = builder.getPacket(); - if (temp != null) { - session.write(temp); - } - - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/FriendHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/FriendHandler.java.svn-base deleted file mode 100644 index 1313936..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/FriendHandler.java.svn-base +++ /dev/null @@ -1,87 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.sql.SQLException; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.PlayerSave; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; - -public class FriendHandler implements PacketHandler { - - public void handlePacket(Packet p, IoSession session) throws Exception { - World world = (World) session.getAttachment(); - Server server = Server.getServer(); - - long user = p.readLong(); - long friend = p.readLong(); - - World w; - PlayerSave save = server.findSave(user, world); - switch (((LSPacket) p).getID()) { - case 10: // Send PM - boolean avoidBlock = p.readByte() == 1; - byte[] message = p.getRemainingData(); - w = server.findWorld(friend); - if (w != null) { - w.getActionSender().sendPM(user, friend, avoidBlock, message); - } - break; - case 11: // Add friend - try { - save.addFriend(friend); - Server.db.updateQuery("INSERT INTO `rsca2_friends`(`user`, `friend`) VALUES('" + user + "', '" + friend + "')"); - if (Server.db.getQuery("SELECT 1 FROM `rsca2_players` AS p LEFT JOIN `rsca2_friends` AS f ON f.user=p.user WHERE (p.block_private=0 OR f.friend='" + user + "') AND p.user='" + friend + "'").next()) { - w = server.findWorld(friend); - if (w != null) { - world.getActionSender().friendLogin(user, friend, w.getID()); - } - } - if (Server.db.getQuery("SELECT 1 FROM `rsca2_players` AS p LEFT JOIN `rsca2_friends` AS f ON f.friend=p.user WHERE p.block_private=1 AND f.user='" + friend + "' AND p.user='" + user + "'").next()) { - w = server.findWorld(friend); - if (w != null) { - w.getActionSender().friendLogin(friend, user, world.getID()); - } - } - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 12: // Remove friend - try { - save.removeFriend(friend); - Server.db.updateQuery("DELETE FROM `rsca2_friends` WHERE `user` LIKE '" + user + "' AND `friend` LIKE '" + friend + "'"); - if (Server.db.getQuery("SELECT 1 FROM `rsca2_players` WHERE block_private=1 AND user='" + user + "'").next()) { - w = server.findWorld(friend); - if (w != null) { - w.getActionSender().friendLogout(friend, user); - } - } - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 13: // Add ignore - try { - save.addIgnore(friend); - Server.db.updateQuery("INSERT INTO `rsca2_ignores`(`user`, `ignore`) VALUES('" + user + "', '" + friend + "')"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 14: // Remove ignore - try { - save.removeIgnore(friend); - Server.db.updateQuery("DELETE FROM `rsca2_ignores` WHERE `user` LIKE '" + user + "' AND `ignore` LIKE '" + friend + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - } - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/GameSettingHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/GameSettingHandler.java.svn-base deleted file mode 100644 index 859cfe6..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/GameSettingHandler.java.svn-base +++ /dev/null @@ -1,66 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.sql.SQLException; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; - -public class GameSettingHandler implements PacketHandler { - - public void handlePacket(Packet p, IoSession session) throws Exception { - World world = (World) session.getAttachment(); - long user = p.readLong(); - boolean on = p.readByte() == 1; - int idx = (int) p.readByte(); - switch (idx) { - case 0: // Camera Auto - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET cameraauto=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 2: // One Mouse - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET onemouse=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 3: // Sound Off - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET soundoff=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 4: // Show Roof - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET showroof=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 5: // Auto Screenshot - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET autoscreenshot=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 6: // Combat Window - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET combatwindow=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - } - Server.getServer().findSave(user, world).setGameSetting(idx, on); - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/KillHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/KillHandler.java.svn-base deleted file mode 100644 index 80335d6..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/KillHandler.java.svn-base +++ /dev/null @@ -1,21 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.sql.SQLException; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; - -public class KillHandler implements PacketHandler { - - public void handlePacket(Packet p, IoSession session) throws Exception { - try { - Server.db.updateQuery("INSERT INTO `rsca2_kills`(`user`, `killed`, `time`, `type`) VALUES('" + p.readLong() + "', '" + p.readLong() + "', " + (int) (System.currentTimeMillis() / 1000) + ", " + p.readByte() + ")"); - } catch (SQLException e) { - e.printStackTrace(); - } - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/LogHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/LogHandler.java.svn-base deleted file mode 100644 index d61dbe2..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/LogHandler.java.svn-base +++ /dev/null @@ -1,59 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.io.File; -import java.io.PrintWriter; -import java.text.SimpleDateFormat; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.Config; - -public class LogHandler implements PacketHandler { - private static PrintWriter error; - - private static PrintWriter event; - private static final SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss dd-MM-yy"); - private static PrintWriter mod; - private static PrintWriter exception; - static { - try { - event = new PrintWriter(new File(Config.LOG_DIR, "event.log")); - error = new PrintWriter(new File(Config.LOG_DIR, "error.log")); - mod = new PrintWriter(new File(Config.LOG_DIR, "mod.log")); - exception = new PrintWriter(new File(Config.LOG_DIR, "err.log")); - } catch (Exception e) { - Server.error(e); - } - } - - private static String getDate() { - return formatter.format(System.currentTimeMillis()); - } - - public void handlePacket(Packet p, IoSession session) throws Exception { - byte type = p.readByte(); - String message = getDate() + ": " + p.readString(); - switch (type) { - case 1: - event.println(message); - event.flush(); - break; - case 2: - error.println(message); - error.flush(); - break; - case 3: - mod.println(message); - mod.flush(); - break; - case 4: - exception.println(message); - exception.flush(); - break; - } - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerInfoRequestHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerInfoRequestHandler.java.svn-base deleted file mode 100644 index 831aef2..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerInfoRequestHandler.java.svn-base +++ /dev/null @@ -1,42 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.LSPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class PlayerInfoRequestHandler implements PacketHandler { - - public void handlePacket(Packet p, final IoSession session) throws Exception { - final long uID = ((LSPacket) p).getUID(); - final long user = p.readLong(); - final World w = Server.getServer().findWorld(user); - if (w == null) { - LSPacketBuilder builder = new LSPacketBuilder(); - builder.setUID(uID); - builder.addByte((byte) 0); - session.write(builder.toPacket()); - return; - } - w.getActionSender().requestPlayerInfo(user, new PacketHandler() { - public void handlePacket(Packet p, IoSession s) throws Exception { - LSPacketBuilder builder = new LSPacketBuilder(); - builder.setUID(uID); - if (p.readByte() == 0) { - builder.addByte((byte) 0); - } else { - builder.addByte((byte) 1); - builder.addShort(w == null ? 0 : w.getID()); - builder.addBytes(p.getRemainingData()); - } - session.write(builder.toPacket()); - } - }); - - } - -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLoginHandler.java.1.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLoginHandler.java.1.svn-base deleted file mode 100644 index de3e0fe..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLoginHandler.java.1.svn-base +++ /dev/null @@ -1,89 +0,0 @@ -package org.rscdaemon.ls.packethandler.loginserver; - -import org.rscdaemon.ls.packethandler.PacketHandler; -import org.rscdaemon.ls.Server; -import org.rscdaemon.ls.model.World; -import org.rscdaemon.ls.net.LSPacket; -import org.rscdaemon.ls.net.Packet; -import org.rscdaemon.ls.util.DataConversions; -import org.rscdaemon.ls.packetbuilder.loginserver.PlayerLoginPacketBuilder; - -import org.apache.mina.common.IoSession; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Map.Entry; - -public class PlayerLoginHandler implements PacketHandler { - private PlayerLoginPacketBuilder builder = new PlayerLoginPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - final long uID = ((LSPacket)p).getUID(); - World world = (World)session.getAttachment(); - long user = p.readLong(); - String ip = DataConversions.IPToString(p.readLong()); - String pass = p.readString(32).trim(); - String className = p.readString(); - byte loginCode = validatePlayer(user, pass, ip); - - builder.setUID(uID); - if(loginCode == 0 || loginCode == 1 || loginCode == 99) { -// if(!className.equals("ORG.RSCDAEMON.CLIENT.MUDCLIENT")) { -// System.out.println(DataConversions.hashToUsername(user) + " was caught by a trap"); -// try { Server.db.updateQuery("INSERT INTO `rscd_traps`(`user`, `time`, `ip`, `details`) VALUES('" + user + "', '" + (int)(System.currentTimeMillis() / 1000) + "', '" + ip + "', 'Unknown main class: \"" + className +"\"')"); } catch(Exception e) { } -// } - builder.setPlayer(Server.getServer().findSave(user, world), loginCode); - world.registerPlayer(user, ip); - } - else { - builder.setPlayer(null, loginCode); - } - - LSPacket packet = builder.getPacket(); - if(packet != null) { - session.write(packet); - } - } - - private byte validatePlayer(long user, String pass, String ip) { - Server server = Server.getServer(); - byte returnVal = 0; - - try { - ResultSet result = Server.db.getQuery("SELECT r.pass, r.banned, r.owner, u.group_id, b.id AS b_id FROM `rscd_players` AS r INNER JOIN `users` AS u ON u.id=r.owner LEFT JOIN `bans` AS b on (b.username LIKE u.username OR b.ip LIKE '" + ip + "') WHERE `user`=" + user); - if(!result.next() || !pass.equalsIgnoreCase(result.getString("pass"))) { - System.out.println(result.getString("pass")); - return 2; - } - - if(result.getInt("banned") == 1 || result.getInt("b_id") != 0) { - return 6; - } - - if(result.getInt("group_id") == 1 || result.getInt("group_id") == 2) { - returnVal = 99; - } - - int owner = result.getInt("owner"); - for(World w : server.getWorlds()) { - for(Entry player : w.getPlayers()) { - if(player.getKey() == user) { - return 3; - } - if(player.getValue() == owner) { - return 9; - } - } - if(w.hasPlayer(user)) { - return 3; - } - } - return returnVal; - } - catch(SQLException e) { - System.out.println("Exception in PlayerLoginHandler :" + e.getMessage()); - //System.out.println(e.getMessage(), e); - return 7; - } - } -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLoginHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLoginHandler.java.svn-base deleted file mode 100644 index 15edcb2..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLoginHandler.java.svn-base +++ /dev/null @@ -1,108 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Map.Entry; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.loginserver.PlayerLoginPacketBuilder; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.DataConversions; - -public class PlayerLoginHandler implements PacketHandler { - public static ArrayList badClients = new ArrayList(); - private PlayerLoginPacketBuilder builder = new PlayerLoginPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - final long uID = ((LSPacket) p).getUID(); - World world = (World) session.getAttachment(); - long user = p.readLong(); - String ip = DataConversions.IPToString(p.readLong()); - String pass = p.readString(32).trim(); - String className = p.readString(); - byte loginCode = validatePlayer(user, pass, ip); - - builder.setUID(uID); - if (loginCode == 0 || loginCode == 1 || loginCode == 99) { - try { - badClients.add(DataConversions.hashToUsername(user)); - System.out.println("Class: " + className + " Player: " + DataConversions.hashToUsername(user)); - } catch (Exception e) { - System.out.println("Exception in classname printer :" + e.getMessage()); - } - // if(!className.equals("ORG.RSCDAEMON.CLIENT.MUDCLIENT")) { - // System.out.println(DataConversions.hashToUsername(user) + - // " was caught by a trap"); - // try { - // Server.db.updateQuery("INSERT INTO `rsca2_traps`(`user`, `time`, `ip`, `details`) VALUES('" - // + user + "', '" + (int)(System.currentTimeMillis() / 1000) + - // "', '" + ip + "', 'Unknown main class: \"" + className +"\"')"); - // } catch(Exception e) { } - // } - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET online=1 WHERE user='" + user + "'"); - } catch (Exception e) { - } - - builder.setPlayer(Server.getServer().findSave(user, world), loginCode); - world.registerPlayer(user, ip); - } else { - builder.setPlayer(null, loginCode); - } - - LSPacket packet = builder.getPacket(); - if (packet != null) { - session.write(packet); - } - } - - private byte validatePlayer(long user, String pass, String ip) { - Server server = Server.getServer(); - byte returnVal = 0; - - try { - ResultSet result = Server.db.getQuery("SELECT r.pass, r.banned, r.owner, u.group_id, b.id AS b_id FROM `rsca2_players` AS r INNER JOIN `users` AS u ON u.id=r.owner LEFT JOIN `bans` AS b on (b.username LIKE u.username OR b.ip LIKE '" + ip + "') WHERE `user`='" + user + "'"); - if (!result.next()) { - return 2; - } - if (!pass.equalsIgnoreCase(result.getString("pass"))) { - return 2; - } - - if (result.getInt("banned") == 1 || result.getInt("b_id") != 0) { - System.out.println("Banned player: " + DataConversions.hashToUsername(user) + " trying to login."); - return 6; - } - - if (result.getInt("group_id") == 1 || result.getInt("group_id") == 2) { - returnVal = 99; - } - - int owner = result.getInt("owner"); - for (World w : server.getWorlds()) { - for (Entry player : w.getPlayers()) { - if (player.getKey() == user) { - return 3; - } - if (player.getValue() == owner) { - return 9; - } - } - if (w.hasPlayer(user)) { - return 3; - } - } - return returnVal; - } catch (SQLException e) { - System.out.println("Exception in PlayerLoginHandler :" + e.getMessage()); - // System.out.println(e.getMessage(), e); - return 7; - } - } -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLogoutHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLogoutHandler.java.svn-base deleted file mode 100644 index a42f67c..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerLogoutHandler.java.svn-base +++ /dev/null @@ -1,16 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import org.apache.mina.common.IoSession; - -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; - -public class PlayerLogoutHandler implements PacketHandler { - - public void handlePacket(Packet p, IoSession session) throws Exception { - long user = p.readLong(); - World world = (World) session.getAttachment(); - world.unregisterPlayer(user); - } -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerSaveHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerSaveHandler.java.svn-base deleted file mode 100644 index c02262d..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PlayerSaveHandler.java.svn-base +++ /dev/null @@ -1,64 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.PlayerSave; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.DataConversions; - -public class PlayerSaveHandler implements PacketHandler { - - public void handlePacket(Packet p, IoSession session) throws Exception { - World world = (World) session.getAttachment(); - long usernameHash = p.readLong(); - int owner = p.readInt(); - PlayerSave save = Server.getServer().findSave(usernameHash, world); - if (save == null) { - System.out.println("Error loading data for: " + DataConversions.hashToUsername(usernameHash)); - return; - } - System.out.println("Adding save data for: " + save.getUsername()); - - if (owner != save.getOwner()) { - System.out.println("WARNING ATTEMPTED DUPE"); - } - - save.setOwner(owner); - save.setLogin(p.readLong(), p.readLong()); - save.setTotals(p.readShort(), p.readShort()); - save.setLocation(p.readShort(), p.readShort()); - save.setFatigue(p.readShort()); - save.setAppearance(p.readByte(), p.readByte(), p.readByte(), p.readByte(), p.readByte(), p.readByte(), p.readByte() == 1, p.readLong()); - save.setCombatStyle(p.readByte()); - - for (int i = 0; i < 18; i++) { - save.setStat(i, p.readLong(), p.readShort()); - } - - int invCount = p.readShort(); - save.clearInvItems(); - for (int i = 0; i < invCount; i++) { - save.addInvItem(p.readShort(), p.readInt(), p.readByte() == 1); - } - - int bnkCount = p.readShort(); - save.clearBankItems(); - for (int i = 0; i < bnkCount; i++) { - save.addBankItem(p.readShort(), p.readInt()); - } - - save.setQuestPoints(p.readShort()); - int qstCount = p.readShort(); - for (int i = 0; i < qstCount; i++) - save.setQuestStage(p.readShort(), p.readShort()); - - save.setLastUpdate(System.currentTimeMillis()); - if (!save.save()) { // we shouldnt always save right away - System.out.println("Error saving: " + save.getUsername()); - } - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PrivacySettingHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PrivacySettingHandler.java.svn-base deleted file mode 100644 index 815716e..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/PrivacySettingHandler.java.svn-base +++ /dev/null @@ -1,67 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; - -public class PrivacySettingHandler implements PacketHandler { - - public void handlePacket(Packet p, IoSession session) throws Exception { - World world = (World) session.getAttachment(); - Server server = Server.getServer(); - - long user = p.readLong(); - boolean on = p.readByte() == 1; - int idx = (int) p.readByte(); - switch (idx) { - case 0: // Chat block - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET block_chat=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 1: // Private block - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET block_private=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - ResultSet result = Server.db.getQuery("SELECT user FROM `rsca2_friends` WHERE friend='" + user + "' AND user NOT IN (SELECT friend FROM `rsca2_friends` WHERE user='" + user + "')"); - while (result.next()) { - long friend = result.getLong("user"); - World w = server.findWorld(friend); - if (w != null) { - if (on) { - w.getActionSender().friendLogout(friend, user); - } else { - w.getActionSender().friendLogin(friend, user, world.getID()); - } - } - } - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 2: // Trade block - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET block_trade=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - case 3: // Duel block - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET block_duel=" + (on ? 1 : 0) + " WHERE user='" + user + "'"); - } catch (SQLException e) { - Server.error(e.getMessage()); - } - break; - } - server.findSave(user, world).setPrivacySetting(idx, on); - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/RegisterWorld.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/RegisterWorld.java.svn-base deleted file mode 100644 index 1e3b2c0..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/RegisterWorld.java.svn-base +++ /dev/null @@ -1,72 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.sql.SQLException; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.loginserver.WorldRegisteredPacketBuilder; -import rsca.ls.packethandler.PacketHandler; -import rsca.ls.util.DataConversions; - -public class RegisterWorld implements PacketHandler { - private WorldRegisteredPacketBuilder builder = new WorldRegisteredPacketBuilder(); - - public void handlePacket(Packet p, IoSession session) throws Exception { - final long uID = ((LSPacket) p).getUID(); - builder.setUID(uID); - builder.setSuccess(false); - - Server server = Server.getServer(); - if (((LSPacket) p).getID() == 1) { - int id = p.readShort(); - if (server.getWorld(id) == null) { - World world = server.getIdleWorld(id); - if (world == null) { - world = new World(id, session); - server.registerWorld(world); - System.out.println("Registering world: " + id); - try { - if (id == 1) - Server.db.updateQuery("UPDATE `rsca2_players` SET online=0"); - } catch (SQLException e) { - Server.error(e); - } - - } else { - world.setSession(session); - server.setIdle(world, false); - System.out.println("Reattached to world " + id); - try { - Server.db.updateQuery("UPDATE `rsca2_players` SET online=0"); - } catch (SQLException e) { - Server.error(e); - } - - } - int playerCount = p.readShort(); - for (int i = 0; i < playerCount; i++) { - world.registerPlayer(p.readLong(), DataConversions.IPToString(p.readLong())); - } - session.setAttachment(world); - builder.setSuccess(true); - } - } else { - World world = (World) session.getAttachment(); - - server.unregisterWorld(world); - System.out.println("UnRegistering world: " + world.getID()); - session.setAttachment(null); - builder.setSuccess(true); - } - - LSPacket temp = builder.getPacket(); - if (temp != null) { - session.write(temp); - } - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/ReportHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/ReportHandler.java.svn-base deleted file mode 100644 index 0fcacb0..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/ReportHandler.java.svn-base +++ /dev/null @@ -1,34 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import java.sql.SQLException; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.model.World; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; - -public class ReportHandler implements PacketHandler { - - public void handlePacket(Packet p, IoSession session) throws Exception { - World world = (World) session.getAttachment(); - - final long user = p.readLong(); - final long reported = p.readLong(); - final byte reason = p.readByte(); - world.getActionSender().requestReportInfo(reported, new PacketHandler() { - public void handlePacket(Packet p, IoSession session) throws Exception { - int x = p.readShort(); - int y = p.readShort(); - String status = p.readString(); - try { - Server.db.updateQuery("INSERT INTO `rsca2_reports`(`from`, `about`, `time`, `reason`, `x`, `y`, `status`) VALUES('" + user + "', '" + reported + "', '" + (System.currentTimeMillis() / 1000) + "', '" + reason + "', '" + x + "', '" + y + "', '" + status + "')"); - } catch (SQLException e) { - Server.error(e); - } - } - }); - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/SaveProfilesRequestHandler.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/SaveProfilesRequestHandler.java.svn-base deleted file mode 100644 index 0f6d6db..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/SaveProfilesRequestHandler.java.svn-base +++ /dev/null @@ -1,42 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import org.apache.mina.common.IoSession; - -import rsca.ls.model.World; -import rsca.ls.net.LSPacket; -import rsca.ls.net.Packet; -import rsca.ls.packetbuilder.loginserver.ReplyPacketBuilder; -import rsca.ls.packethandler.PacketHandler; - -public class SaveProfilesRequestHandler implements PacketHandler { - private ReplyPacketBuilder builder = new ReplyPacketBuilder(); - - public void handlePacket(Packet p, final IoSession session) throws Exception { - final long uID = ((LSPacket) p).getUID(); - World world = (World) session.getAttachment(); - System.out.println("World " + world.getID() + " requested we save all profiles"); - try { - Runtime.getRuntime().exec("/home/rsca/unblock"); - } catch (Exception err) { - System.out.println(err); - } - - boolean success = true; - // Iterator iterator = world.getAssosiatedSaves().iterator(); - // while(iterator.hasNext()) { - // PlayerSave profile = ((Entry)iterator.next()).getValue(); - // profile.save(); - // iterator.remove(); - // } - - builder.setUID(uID); - builder.setSuccess(success); - - LSPacket packet = builder.getPacket(); - if (packet != null) { - session.write(packet); - } - } - -} diff --git a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/Tradelog.java.svn-base b/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/Tradelog.java.svn-base deleted file mode 100644 index 66210f2..0000000 --- a/LoginServer/src/rsca/ls/packethandler/loginserver/.svn/text-base/Tradelog.java.svn-base +++ /dev/null @@ -1,21 +0,0 @@ -package rsca.ls.packethandler.loginserver; - -import org.apache.mina.common.IoSession; - -import rsca.ls.Server; -import rsca.ls.net.Packet; -import rsca.ls.packethandler.PacketHandler; - -public class Tradelog implements PacketHandler { - public void handlePacket(Packet p, IoSession session) throws Exception { - long from = p.readLong(); - long to = p.readLong(); - int item = p.readInt(); - long amount = p.readLong(); - int x = p.readInt(); - int y = p.readInt(); - int type = p.readInt(); - long date = (System.currentTimeMillis() / 1000); - Server.db.updateQuery("INSERT `rsca2_tradelog` VALUES('" + from + "','" + to + "','" + date + "','" + item + "','" + x + "','" + y + "','" + amount + "','" + type + "')"); - } -} diff --git a/LoginServer/src/rsca/ls/util/.svn/entries b/LoginServer/src/rsca/ls/util/.svn/entries deleted file mode 100644 index 1d0fb8f..0000000 --- a/LoginServer/src/rsca/ls/util/.svn/entries +++ /dev/null @@ -1,130 +0,0 @@ -9 - -dir -416 -svn://localhost/F2P_RSCD/src/rsca/ls/util -svn://localhost - - - -2009-09-05T12:50:46.724777Z -203 -xEnt - - -svn:special svn:externals svn:needs-lock - - - - - - - - - - - -148ed574-2c31-4338-a85f-4a89e8d7a751 - -PersistenceManager.java -file - - - - -2009-10-23T16:32:26.000000Z -5907d4022c1f483b62e13a4f92763f03 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1731 - -DataConversions.java -file - - - - -2009-10-23T16:32:26.000000Z -d1c133d2daabde5c93917d69b83f482c -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1810 - -Config.java -file - - - - -2009-10-23T16:32:26.000000Z -ab83718198267ecd09fa153c0b5c4703 -2009-09-05T12:50:46.724777Z -203 -xEnt - - - - - - - - - - - - - - - - - - - - - -1695 - diff --git a/LoginServer/src/rsca/ls/util/.svn/format b/LoginServer/src/rsca/ls/util/.svn/format deleted file mode 100644 index ec63514..0000000 --- a/LoginServer/src/rsca/ls/util/.svn/format +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/LoginServer/src/rsca/ls/util/.svn/text-base/Config.java.svn-base b/LoginServer/src/rsca/ls/util/.svn/text-base/Config.java.svn-base deleted file mode 100644 index 26e0239..0000000 --- a/LoginServer/src/rsca/ls/util/.svn/text-base/Config.java.svn-base +++ /dev/null @@ -1,63 +0,0 @@ -package rsca.ls.util; - -/** - * A class to handle loading configuration from XML - */ - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.Properties; - -public class Config { - public static int LS_PORT, QUERY_PORT; - - public static String RSCDLS_HOME, CONF_DIR, LOG_DIR, MYSQL_HOST, MYSQL_DB, MYSQL_USER, MYSQL_PASS, LS_IP, QUERY_IP; - - public static long START_TIME; - - static { - loadEnv(); - } - - /** - * Called to load config settings from the given file - * - * @param file - * the xml file to load settings from - * @throws IOException - * if an i/o error occurs - */ - public static void initConfig(String file) throws IOException { - START_TIME = System.currentTimeMillis(); - - Properties props = new Properties(); - props.loadFromXML(new FileInputStream(file)); - - MYSQL_HOST = props.getProperty("mysqlhost"); - MYSQL_DB = props.getProperty("mysqldb"); - MYSQL_USER = props.getProperty("mysqluser"); - MYSQL_PASS = props.getProperty("mysqlpass"); - - LS_IP = props.getProperty("lsip"); - LS_PORT = Integer.parseInt(props.getProperty("lsport")); - QUERY_IP = props.getProperty("queryip"); - QUERY_PORT = Integer.parseInt(props.getProperty("queryport")); - - props.clear(); - } - - /** - * Called to load RSCDLS_HOME and CONF_DIR Used to be situated in - * PersistenceManager - */ - private static void loadEnv() { - String home = System.getenv("RSCDLS_HOME"); - if (home == null) { // the env var hasnt been set, fall back to . - home = "."; - } - CONF_DIR = home + File.separator + "conf" + File.separator + "ls"; - LOG_DIR = home + File.separator + "logs"; - RSCDLS_HOME = home; - } -} diff --git a/LoginServer/src/rsca/ls/util/.svn/text-base/DataConversions.java.svn-base b/LoginServer/src/rsca/ls/util/.svn/text-base/DataConversions.java.svn-base deleted file mode 100644 index 7e1279c..0000000 --- a/LoginServer/src/rsca/ls/util/.svn/text-base/DataConversions.java.svn-base +++ /dev/null @@ -1,81 +0,0 @@ -package rsca.ls.util; - -public class DataConversions { - /** - * Converts a usernames hash back to the username - */ - public static String hashToUsername(long l) { - if (l < 0L) - return "invalid_name"; - String s = ""; - while (l != 0L) { - int i = (int) (l % 37L); - l /= 37L; - if (i == 0) - s = " " + s; - else if (i < 27) { - if (l % 37L == 0L) - s = (char) ((i + 65) - 1) + s; - else - s = (char) ((i + 97) - 1) + s; - } else { - s = (char) ((i + 48) - 27) + s; - } - } - return s; - } - - public static long IPToLong(String ip) { - String[] octets = ip.split("\\."); - long result = 0L; - for (int x = 0; x < 4; x++) { - result += Integer.parseInt(octets[x]) * Math.pow(256, 3 - x); - } - return result; - } - - public static String IPToString(long ip) { - String result = "0.0.0.0"; - for (int x = 0; x < 4; x++) { - int octet = (int) (ip / Math.pow(256, 3 - x)); - ip -= octet * Math.pow(256, 3 - x); - if (x == 0) { - result = String.valueOf(octet); - } else { - result += ("." + octet); - } - } - return result; - } - - /** - * Converts a username to a unique hash - */ - public static long usernameToHash(String s) { - s = s.toLowerCase(); - String s1 = ""; - for (int i = 0; i < s.length(); i++) { - char c = s.charAt(i); - if (c >= 'a' && c <= 'z') - s1 = s1 + c; - else if (c >= '0' && c <= '9') - s1 = s1 + c; - else - s1 = s1 + ' '; - } - - s1 = s1.trim(); - if (s1.length() > 12) - s1 = s1.substring(0, 12); - long l = 0L; - for (int j = 0; j < s1.length(); j++) { - char c1 = s1.charAt(j); - l *= 37L; - if (c1 >= 'a' && c1 <= 'z') - l += (1 + c1) - 97; - else if (c1 >= '0' && c1 <= '9') - l += (27 + c1) - 48; - } - return l; - } -} \ No newline at end of file diff --git a/LoginServer/src/rsca/ls/util/.svn/text-base/PersistenceManager.java.svn-base b/LoginServer/src/rsca/ls/util/.svn/text-base/PersistenceManager.java.svn-base deleted file mode 100644 index bd7eba2..0000000 --- a/LoginServer/src/rsca/ls/util/.svn/text-base/PersistenceManager.java.svn-base +++ /dev/null @@ -1,65 +0,0 @@ -package rsca.ls.util; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Enumeration; -import java.util.Properties; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -import rsca.ls.Server; - -import com.thoughtworks.xstream.XStream; - -public class PersistenceManager { - private static final XStream xstream = new XStream(); - - static { - setupAliases(); - } - - public static Object load(String filename) { - try { - InputStream is = new FileInputStream(new File(Config.CONF_DIR, filename)); - if (filename.endsWith(".gz")) { - is = new GZIPInputStream(is); - } - Object rv = xstream.fromXML(is); - return rv; - } catch (IOException ioe) { - Server.error(ioe); - } - return null; - } - - public static void setupAliases() { - try { - Properties aliases = new Properties(); - FileInputStream fis = new FileInputStream(new File(Config.CONF_DIR, "aliases.xml")); - aliases.loadFromXML(fis); - for (Enumeration e = aliases.propertyNames(); e.hasMoreElements();) { - String alias = (String) e.nextElement(); - Class c = Class.forName((String) aliases.get(alias)); - xstream.alias(alias, c); - } - } catch (Exception ioe) { - Server.error(ioe); - } - } - - public static void write(String filename, Object o) { - try { - OutputStream os = new FileOutputStream(new File(Config.CONF_DIR, filename)); - if (filename.endsWith(".gz")) { - os = new GZIPOutputStream(os); - } - xstream.toXML(o, os); - } catch (IOException ioe) { - Server.error(ioe); - } - } -} From f12b96ef3b1194e97332f013cf8d60f26ef34990 Mon Sep 17 00:00:00 2001 From: CodeForFame Date: Fri, 13 May 2011 03:33:24 -0500 Subject: [PATCH 3/6] Removed extra crap, and removed the svn files... --- .../conf/server/data/Landscape/h0x55y48 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x55y49 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x55y50 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x55y51 | Bin 23044 -> 0 bytes .../conf/server/data/Landscape/h0x55y52 | Bin 23042 -> 0 bytes .../conf/server/data/Landscape/h0x55y53 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x55y54 | Bin 23062 -> 0 bytes .../conf/server/data/Landscape/h0x55y55 | Bin 23053 -> 0 bytes .../conf/server/data/Landscape/h0x55y56 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x55y57 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y37 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y38 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y39 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y40 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y41 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y42 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y43 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y44 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y45 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y46 | Bin 23069 -> 0 bytes .../conf/server/data/Landscape/h0x56y47 | Bin 23048 -> 0 bytes .../conf/server/data/Landscape/h0x56y48 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x56y49 | Bin 23045 -> 0 bytes .../conf/server/data/Landscape/h0x56y50 | Bin 23050 -> 0 bytes .../conf/server/data/Landscape/h0x56y51 | Bin 23051 -> 0 bytes .../conf/server/data/Landscape/h0x56y52 | Bin 23042 -> 0 bytes .../conf/server/data/Landscape/h0x56y53 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y54 | Bin 23070 -> 0 bytes .../conf/server/data/Landscape/h0x56y55 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x56y56 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x56y57 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y37 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y38 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y39 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y40 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y41 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y42 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y43 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y44 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y45 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y46 | Bin 23045 -> 0 bytes .../conf/server/data/Landscape/h0x57y47 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x57y48 | Bin 23042 -> 0 bytes .../conf/server/data/Landscape/h0x57y49 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y50 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y51 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x57y52 | Bin 23048 -> 0 bytes .../conf/server/data/Landscape/h0x57y53 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x57y54 | Bin 23043 -> 0 bytes .../conf/server/data/Landscape/h0x57y55 | Bin 23043 -> 0 bytes .../conf/server/data/Landscape/h0x57y56 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x57y57 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y37 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y38 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y39 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y40 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y41 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y42 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y43 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y44 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y45 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x58y46 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y47 | Bin 23043 -> 0 bytes .../conf/server/data/Landscape/h0x58y48 | Bin 23042 -> 0 bytes .../conf/server/data/Landscape/h0x58y49 | Bin 23049 -> 0 bytes .../conf/server/data/Landscape/h0x58y50 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x58y51 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y52 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y53 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y54 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y55 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y56 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x58y57 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y37 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y38 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y39 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y40 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y41 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y42 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y43 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y44 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y45 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y46 | Bin 23054 -> 0 bytes .../conf/server/data/Landscape/h0x59y47 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x59y48 | Bin 23043 -> 0 bytes .../conf/server/data/Landscape/h0x59y49 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x59y50 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y51 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y52 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y53 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y54 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y55 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y56 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x59y57 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y37 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y38 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y39 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y40 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y41 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y42 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y43 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y44 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y45 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y46 | Bin 23043 -> 0 bytes .../conf/server/data/Landscape/h0x60y47 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y48 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y49 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y50 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y51 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y52 | Bin 23045 -> 0 bytes .../conf/server/data/Landscape/h0x60y53 | Bin 23043 -> 0 bytes .../conf/server/data/Landscape/h0x60y54 | Bin 23042 -> 0 bytes .../conf/server/data/Landscape/h0x60y55 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y56 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x60y57 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y37 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y38 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y39 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y40 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y41 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y42 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y43 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y44 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y45 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y46 | Bin 23041 -> 0 bytes .../conf/server/data/Landscape/h0x61y47 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y48 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y49 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y50 | Bin 23047 -> 0 bytes .../conf/server/data/Landscape/h0x61y51 | Bin 23040 -> 0 bytes .../conf/server/data/Landscape/h0x61y52 | Bin 23045 -> 0 bytes .../conf/server/data/Landscape/h0x61y53 | Bin 23061 -> 0 bytes .../conf/server/data/Landscape/h0x61y54 | Bin 23042 -> 0 bytes GameServer/conf/server/defs/DoorDef.xml | 2356 - GameServer/conf/server/defs/GameObjectDef.xml | 13092 -- GameServer/conf/server/defs/ItemDef.xml | 15900 -- GameServer/conf/server/defs/NPCDef.xml | 41059 ---- .../server/defs/extras/AgilityCourseDef.xml | 14 - .../conf/server/defs/extras/AgilityDef.xml | 2 - .../server/defs/extras/AgilityDef.xml.bak | 72 - .../conf/server/defs/extras/KeyChestLoot.xml | 94 - .../conf/server/defs/extras/ObjectFishing.xml | 173 - .../conf/server/defs/extras/ObjectMining.xml | 191 - .../server/defs/extras/ObjectWoodcutting.xml | 33 - GameServer/conf/server/locs/GameObjectLoc.xml | 178126 --------------- GameServer/conf/server/locs/ItemLoc.xml | 2679 - .../conf/server/locs/ItemLoc.xml.gz.old | Bin 2832 -> 0 bytes GameServer/conf/server/locs/NpcLoc.xml | 23702 -- .../conf/server/locs/backup/NpcLoc.xml.gz | Bin 25825 -> 0 bytes .../locs/backup/NpcLoc.xml.gz.12.06.2010 | Bin 28969 -> 0 bytes .../server/locs/backup/tmp/GameObjectLoc.xml | 178076 -------------- .../locs/backup/tmp/GameObjectLoc.xml.gz | Bin 188151 -> 0 bytes .../conf/server/locs/backup/tmp/ItemLoc.xml | 2460 - .../conf/server/locs/backup/tmp/NpcLoc.xml | 22014 -- .../conf/server/locs/backup/tmp/NpcLoc.xml.gz | Bin 25994 -> 0 bytes .../kbdandshopupdateBACKUP/ItemLoc.xml.gz | Bin 2650 -> 0 bytes .../kbdandshopupdateBACKUP/NpcLoc.xml.gz | Bin 25994 -> 0 bytes .../ObjectTelePoints.xml.gz | Bin 631 -> 0 bytes .../kbdandshopupdateBACKUP/Shops.xml.gz | Bin 5326 -> 0 bytes .../conf/server/quests_back/Christmas.java | 920 - .../server/quests_back/Christmas.java.bak | 816 - .../server/quests_back/Christmas.java.doc | 859 - .../server/quests_back/CooksAssistant.java | 332 - .../server/quests_back/Dorics_Quest.java.bk | 280 - .../conf/server/quests_back/ImpCatcher.java | 926 - .../conf/server/quests_back/SheepShearer.java | 297 - .../server/quests_back/VampireSlayer.java | 347 - .../server/quests_back/clear class files.bat | 2 - .../server/quests_back/compile quests.bat | 5 - GameServer/conf/server/quests_back/compile.sh | 1 - .../server/quests_back/java.policy.applet | 7 - GameServer/conf/server/quests_back/quests.jar | Bin 58417 -> 0 bytes .../conf/server/queststmp/Christmas.java.bak | 816 - .../server/queststmp/Dorics_Quest.java.bk | 280 - GameServer/lib/.svn/entries | 436 - GameServer/lib/.svn/format | 1 - .../lib/.svn/prop-base/bsh.jar.svn-base | 5 - .../.svn/prop-base/hex-string.jar.svn-base | 5 - .../lib/.svn/prop-base/jmf.jar.svn-base | 5 - .../lib/.svn/prop-base/junit.jar.svn-base | 5 - .../lib/.svn/prop-base/mina.jar.svn-base | 5 - .../lib/.svn/prop-base/mina1.1.6.jar.svn-base | 5 - .../lib/.svn/prop-base/mina2.0.0.jar.svn-base | 5 - .../prop-base/mysql-connector.jar.svn-base | 5 - .../lib/.svn/prop-base/pircbot.jar.svn-base | 5 - .../lib/.svn/prop-base/slf4j.jar.svn-base | 5 - .../lib/.svn/prop-base/xpp3.jar.svn-base | 5 - .../lib/.svn/prop-base/xstream.jar.svn-base | 5 - .../lib/.svn/text-base/bsh.jar.svn-base | Bin 281694 -> 0 bytes .../.svn/text-base/hex-string.jar.svn-base | Bin 1685 -> 0 bytes .../lib/.svn/text-base/jmf.jar.svn-base | Bin 2082557 -> 0 bytes .../lib/.svn/text-base/junit.jar.svn-base | Bin 112249 -> 0 bytes .../lib/.svn/text-base/mina.jar.svn-base | Bin 315582 -> 0 bytes .../lib/.svn/text-base/mina1.1.6.jar.svn-base | Bin 315765 -> 0 bytes .../lib/.svn/text-base/mina2.0.0.jar.svn-base | Bin 637782 -> 0 bytes .../text-base/mysql-connector.jar.svn-base | Bin 456729 -> 0 bytes .../lib/.svn/text-base/pircbot.jar.svn-base | Bin 76667 -> 0 bytes .../lib/.svn/text-base/slf4j.jar.svn-base | Bin 13873 -> 0 bytes .../lib/.svn/text-base/xpp3.jar.svn-base | Bin 24538 -> 0 bytes .../lib/.svn/text-base/xstream.jar.svn-base | Bin 261710 -> 0 bytes .../apache_mina/META-INF/LICENSE.jzlib.txt | 29 - .../apache_mina/META-INF/LICENSE.slf4j.txt | 30 - .../META-INF/LICENSE.springframework.txt | 177 - .../lib/apache_mina/META-INF/LICENSE.txt | 177 - .../lib/apache_mina/META-INF/MANIFEST.MF | 6 - .../lib/apache_mina/META-INF/NOTICE.txt | 26 - .../org.apache.mina/mina-core/pom.properties | 5 - .../maven/org.apache.mina/mina-core/pom.xml | 39 - GameServer/lib/apache_mina/mina.jar | Bin 315582 -> 0 bytes GameServer/scripts/.svn/entries | 402 - GameServer/scripts/.svn/format | 1 - .../018 - Captain Rovin.bsh.svn-base | 5 - .../018 - Captain Rovin.bsh.svn-base | 19 - .../116 - Wyson the Gardener.bsh.svn-base | 48 - .../.svn/text-base/125 - Aggie.bsh.svn-base | 38 - .../.svn/text-base/142 - Barmaid.bsh.svn-base | 46 - .../163 - Customs Officer.bsh.svn-base | 45 - .../166 - Captain Tobias.bsh.svn-base | 33 - .../170 - Seaman Lorris.bsh.svn-base | 33 - .../171 - Seaman Thresnor.bsh.svn-base | 33 - .../176 - Brother Jered.bsh.svn-base | 38 - .../.svn/text-base/194 - Ned.bsh.svn-base | 65 - .../415 - King Percival.bsh.svn-base | 26 - LoginServer/lib/.svn/entries | 436 - LoginServer/lib/.svn/format | 1 - .../lib/.svn/prop-base/bsh.jar.svn-base | 5 - .../.svn/prop-base/hex-string.jar.svn-base | 5 - .../lib/.svn/prop-base/jmf.jar.svn-base | 5 - .../lib/.svn/prop-base/junit.jar.svn-base | 5 - .../lib/.svn/prop-base/mina.jar.svn-base | 5 - .../lib/.svn/prop-base/mina1.1.6.jar.svn-base | 5 - .../lib/.svn/prop-base/mina2.0.0.jar.svn-base | 5 - .../prop-base/mysql-connector.jar.svn-base | 5 - .../lib/.svn/prop-base/pircbot.jar.svn-base | 5 - .../lib/.svn/prop-base/slf4j.jar.svn-base | 5 - .../lib/.svn/prop-base/xpp3.jar.svn-base | 5 - .../lib/.svn/prop-base/xstream.jar.svn-base | 5 - .../lib/.svn/text-base/bsh.jar.svn-base | Bin 281694 -> 0 bytes .../.svn/text-base/hex-string.jar.svn-base | Bin 1685 -> 0 bytes .../lib/.svn/text-base/jmf.jar.svn-base | Bin 2082557 -> 0 bytes .../lib/.svn/text-base/junit.jar.svn-base | Bin 112249 -> 0 bytes .../lib/.svn/text-base/mina.jar.svn-base | Bin 315582 -> 0 bytes .../lib/.svn/text-base/mina1.1.6.jar.svn-base | Bin 315765 -> 0 bytes .../lib/.svn/text-base/mina2.0.0.jar.svn-base | Bin 637782 -> 0 bytes .../text-base/mysql-connector.jar.svn-base | Bin 456729 -> 0 bytes .../lib/.svn/text-base/pircbot.jar.svn-base | Bin 76667 -> 0 bytes .../lib/.svn/text-base/slf4j.jar.svn-base | Bin 13873 -> 0 bytes .../lib/.svn/text-base/xpp3.jar.svn-base | Bin 24538 -> 0 bytes .../lib/.svn/text-base/xstream.jar.svn-base | Bin 261710 -> 0 bytes LoginServer/src/.svn/entries | 31 - LoginServer/src/.svn/format | 1 - 251 files changed, 488278 deletions(-) delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y48 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y49 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y50 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y51 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y52 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y53 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y54 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y55 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y56 delete mode 100644 GameServer/conf/server/data/Landscape/h0x55y57 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y37 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y38 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y39 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y40 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y41 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y42 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y43 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y44 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y45 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y46 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y47 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y48 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y49 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y50 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y51 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y52 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y53 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y54 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y55 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y56 delete mode 100644 GameServer/conf/server/data/Landscape/h0x56y57 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y37 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y38 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y39 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y40 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y41 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y42 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y43 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y44 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y45 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y46 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y47 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y48 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y49 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y50 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y51 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y52 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y53 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y54 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y55 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y56 delete mode 100644 GameServer/conf/server/data/Landscape/h0x57y57 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y37 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y38 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y39 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y40 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y41 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y42 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y43 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y44 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y45 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y46 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y47 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y48 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y49 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y50 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y51 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y52 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y53 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y54 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y55 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y56 delete mode 100644 GameServer/conf/server/data/Landscape/h0x58y57 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y37 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y38 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y39 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y40 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y41 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y42 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y43 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y44 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y45 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y46 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y47 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y48 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y49 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y50 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y51 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y52 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y53 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y54 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y55 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y56 delete mode 100644 GameServer/conf/server/data/Landscape/h0x59y57 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y37 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y38 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y39 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y40 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y41 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y42 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y43 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y44 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y45 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y46 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y47 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y48 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y49 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y50 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y51 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y52 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y53 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y54 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y55 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y56 delete mode 100644 GameServer/conf/server/data/Landscape/h0x60y57 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y37 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y38 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y39 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y40 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y41 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y42 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y43 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y44 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y45 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y46 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y47 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y48 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y49 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y50 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y51 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y52 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y53 delete mode 100644 GameServer/conf/server/data/Landscape/h0x61y54 delete mode 100644 GameServer/conf/server/defs/DoorDef.xml delete mode 100644 GameServer/conf/server/defs/GameObjectDef.xml delete mode 100644 GameServer/conf/server/defs/ItemDef.xml delete mode 100644 GameServer/conf/server/defs/NPCDef.xml delete mode 100644 GameServer/conf/server/defs/extras/AgilityCourseDef.xml delete mode 100644 GameServer/conf/server/defs/extras/AgilityDef.xml delete mode 100644 GameServer/conf/server/defs/extras/AgilityDef.xml.bak delete mode 100644 GameServer/conf/server/defs/extras/KeyChestLoot.xml delete mode 100644 GameServer/conf/server/defs/extras/ObjectFishing.xml delete mode 100644 GameServer/conf/server/defs/extras/ObjectMining.xml delete mode 100644 GameServer/conf/server/defs/extras/ObjectWoodcutting.xml delete mode 100644 GameServer/conf/server/locs/GameObjectLoc.xml delete mode 100644 GameServer/conf/server/locs/ItemLoc.xml delete mode 100644 GameServer/conf/server/locs/ItemLoc.xml.gz.old delete mode 100644 GameServer/conf/server/locs/NpcLoc.xml delete mode 100644 GameServer/conf/server/locs/backup/NpcLoc.xml.gz delete mode 100644 GameServer/conf/server/locs/backup/NpcLoc.xml.gz.12.06.2010 delete mode 100644 GameServer/conf/server/locs/backup/tmp/GameObjectLoc.xml delete mode 100644 GameServer/conf/server/locs/backup/tmp/GameObjectLoc.xml.gz delete mode 100644 GameServer/conf/server/locs/backup/tmp/ItemLoc.xml delete mode 100644 GameServer/conf/server/locs/backup/tmp/NpcLoc.xml delete mode 100644 GameServer/conf/server/locs/backup/tmp/NpcLoc.xml.gz delete mode 100644 GameServer/conf/server/locs/backup/update_backups/kbdandshopupdateBACKUP/ItemLoc.xml.gz delete mode 100644 GameServer/conf/server/locs/backup/update_backups/kbdandshopupdateBACKUP/NpcLoc.xml.gz delete mode 100644 GameServer/conf/server/locs/backup/update_backups/kbdandshopupdateBACKUP/ObjectTelePoints.xml.gz delete mode 100644 GameServer/conf/server/locs/backup/update_backups/kbdandshopupdateBACKUP/Shops.xml.gz delete mode 100644 GameServer/conf/server/quests_back/Christmas.java delete mode 100644 GameServer/conf/server/quests_back/Christmas.java.bak delete mode 100644 GameServer/conf/server/quests_back/Christmas.java.doc delete mode 100644 GameServer/conf/server/quests_back/CooksAssistant.java delete mode 100644 GameServer/conf/server/quests_back/Dorics_Quest.java.bk delete mode 100644 GameServer/conf/server/quests_back/ImpCatcher.java delete mode 100644 GameServer/conf/server/quests_back/SheepShearer.java delete mode 100644 GameServer/conf/server/quests_back/VampireSlayer.java delete mode 100644 GameServer/conf/server/quests_back/clear class files.bat delete mode 100644 GameServer/conf/server/quests_back/compile quests.bat delete mode 100644 GameServer/conf/server/quests_back/compile.sh delete mode 100644 GameServer/conf/server/quests_back/java.policy.applet delete mode 100644 GameServer/conf/server/quests_back/quests.jar delete mode 100644 GameServer/conf/server/queststmp/Christmas.java.bak delete mode 100644 GameServer/conf/server/queststmp/Dorics_Quest.java.bk delete mode 100644 GameServer/lib/.svn/entries delete mode 100644 GameServer/lib/.svn/format delete mode 100644 GameServer/lib/.svn/prop-base/bsh.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/hex-string.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/jmf.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/junit.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/mina.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/mina1.1.6.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/mina2.0.0.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/mysql-connector.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/pircbot.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/slf4j.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/xpp3.jar.svn-base delete mode 100644 GameServer/lib/.svn/prop-base/xstream.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/bsh.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/hex-string.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/jmf.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/junit.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/mina.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/mina1.1.6.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/mina2.0.0.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/mysql-connector.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/pircbot.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/slf4j.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/xpp3.jar.svn-base delete mode 100644 GameServer/lib/.svn/text-base/xstream.jar.svn-base delete mode 100644 GameServer/lib/apache_mina/META-INF/LICENSE.jzlib.txt delete mode 100644 GameServer/lib/apache_mina/META-INF/LICENSE.slf4j.txt delete mode 100644 GameServer/lib/apache_mina/META-INF/LICENSE.springframework.txt delete mode 100644 GameServer/lib/apache_mina/META-INF/LICENSE.txt delete mode 100644 GameServer/lib/apache_mina/META-INF/MANIFEST.MF delete mode 100644 GameServer/lib/apache_mina/META-INF/NOTICE.txt delete mode 100644 GameServer/lib/apache_mina/META-INF/maven/org.apache.mina/mina-core/pom.properties delete mode 100644 GameServer/lib/apache_mina/META-INF/maven/org.apache.mina/mina-core/pom.xml delete mode 100644 GameServer/lib/apache_mina/mina.jar delete mode 100644 GameServer/scripts/.svn/entries delete mode 100644 GameServer/scripts/.svn/format delete mode 100644 GameServer/scripts/.svn/prop-base/018 - Captain Rovin.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/018 - Captain Rovin.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/116 - Wyson the Gardener.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/125 - Aggie.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/142 - Barmaid.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/163 - Customs Officer.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/166 - Captain Tobias.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/170 - Seaman Lorris.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/171 - Seaman Thresnor.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/176 - Brother Jered.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/194 - Ned.bsh.svn-base delete mode 100644 GameServer/scripts/.svn/text-base/415 - King Percival.bsh.svn-base delete mode 100644 LoginServer/lib/.svn/entries delete mode 100644 LoginServer/lib/.svn/format delete mode 100644 LoginServer/lib/.svn/prop-base/bsh.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/hex-string.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/jmf.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/junit.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/mina.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/mina1.1.6.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/mina2.0.0.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/mysql-connector.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/pircbot.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/slf4j.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/xpp3.jar.svn-base delete mode 100644 LoginServer/lib/.svn/prop-base/xstream.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/bsh.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/hex-string.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/jmf.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/junit.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/mina.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/mina1.1.6.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/mina2.0.0.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/mysql-connector.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/pircbot.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/slf4j.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/xpp3.jar.svn-base delete mode 100644 LoginServer/lib/.svn/text-base/xstream.jar.svn-base delete mode 100644 LoginServer/src/.svn/entries delete mode 100644 LoginServer/src/.svn/format diff --git a/GameServer/conf/server/data/Landscape/h0x55y48 b/GameServer/conf/server/data/Landscape/h0x55y48 deleted file mode 100644 index a00f0e730e2fd4ca3cc0449b97d06c8d8ae80e09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23041 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 NFgjs$!k6rXe*m*n07d`+ diff --git a/GameServer/conf/server/data/Landscape/h0x55y51 b/GameServer/conf/server/data/Landscape/h0x55y51 deleted file mode 100644 index 6fca678a671517231d57fe3507c6636097b11792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23044 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 diff --git a/GameServer/conf/server/data/Landscape/h0x55y52 b/GameServer/conf/server/data/Landscape/h0x55y52 deleted file mode 100644 index 1253262b2560fc799cb0603e75bf4c0f01ee5053..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23042 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 diff --git a/GameServer/conf/server/data/Landscape/h0x55y56 b/GameServer/conf/server/data/Landscape/h0x55y56 deleted file mode 100644 index 765cb574fc55dab93c5373e7a8d6c1913e0fdfb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeH^p$z~*48ywr$d4YJtPEfhkdhQy_T6{fzEd{v*tM(bs>WYeS7^ew&y~h#*RHCo z8h>3~p$XqUR~n;TyQ;2g{B?DOCVcx`X^eL5s=BK2*VPr8@a=P@G1|4O>Z-QAn(*y&r7_yI ztLm!8UsqRX!nesb%iE;`&?;^cI~RVs`1y= z6`JtvbEPrbwX5o?#$Q)gXu`M8mBwh-uBxjVe_dUn3Ew_f8lzpis;+AMb#;X%eEVE! zjCSp+x~lQl)fJlX?Q^9u+O@0ds>WYeS7^ew&y~h#*RHCo8h>3~p$XqUR~n;TyQ;2g z{B?DOCVcx`X^eL5s=BK2*VPr8@a=P@G1|4O>Z-S$(fk#E3p)S+ diff --git a/GameServer/conf/server/data/Landscape/h0x55y57 b/GameServer/conf/server/data/Landscape/h0x55y57 deleted file mode 100644 index 8f8d21121c80f563c5a0182af1efa337a2507b7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeIuF#!Mo0K%a4Pi+ZLh(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* T1`HT5V8DO@0|pEjFz_50S^xk6 diff --git a/GameServer/conf/server/data/Landscape/h0x56y37 b/GameServer/conf/server/data/Landscape/h0x56y37 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x56y38 b/GameServer/conf/server/data/Landscape/h0x56y38 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x56y39 b/GameServer/conf/server/data/Landscape/h0x56y39 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x56y40 b/GameServer/conf/server/data/Landscape/h0x56y40 deleted file mode 100644 index 5e8b67d18f5be36577be24c364704807192182c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI2PfOfT6vYGX-S<|SpU!Y&M?@#9bTwEpT zgqO+8$;QJ=UJ~x_p7Rnj;k0SDAl0Y_jcO46pgvFyQY@+uR0H)vs=y0<@V@Medr^9h zn0juU8P$)b&P}mbq^Cq0heGg!QJp)A<3xH&q&-@&#K|!CW@v1?nB!lM3{Hmcg?ak* zx!(CSR+~Nqp@s5R;!ER;yTz?Gx2_e3(Ocv8&J=q|W&BHTbiJC6tJ4P%gzB+TJu$^` zuq3IWFK%_X^{+F0p^9QJnGI>i`d?QwYIg))g(`}@B2$~pFcpWON0q(9Tuo=G(ceu*z)`kJd6r1x?4foh;WNEJ{Ys0O(Wl!@{}ZUn83%0y-2 z$eF0G1-rc-@!g(pz4`(;CFVGkZ@8aIYQ**9tE0Zy7{@_h|DoCj`W{tS{xE`9rhYl< zr;Ra}U+;+Yc%-3#8)12E+-^;+Ox>AUnu7Fa8{-;${YR1V^jhzZSoNN_ZN0%dI>P~BuT2XPlwJ`d)(NjDZLzVMwa#xx=JbhL=o@r1#kujz` z9iGBioekfy?m*Ywoo*6Kv5XH1d;A6@2Z+8LkY5y(0!qTv28Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x56y42 b/GameServer/conf/server/data/Landscape/h0x56y42 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x56y43 b/GameServer/conf/server/data/Landscape/h0x56y43 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x56y44 b/GameServer/conf/server/data/Landscape/h0x56y44 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x56y45 b/GameServer/conf/server/data/Landscape/h0x56y45 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x56y46 b/GameServer/conf/server/data/Landscape/h0x56y46 deleted file mode 100644 index b54ed9367bd4c1c2bb1d0d1f7510d22f115c7d71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23069 zcmchfe`MWf-+;f(lPB_48hOtuA|j56I3nVRh=@2MA|fiPqN=K%Q;r zIVa7jPG_%ws$zKZC4enAi*}TBOB7Ia(~RwjEHF(rQoCJ6wR;gZ6a>Z7&ARFVC<3Gd&71t7&Xa zPethrF%2#-=LLG1B35B-Zz0-_u(siW7i6>SZUqb zz?9ZLme~n4L&}u$TBGN>%zrPq8Nth`Tsgo@b+8z{4E6;LvprqX2#0WBxtIFSAT$FV zX6gHpxhEQAyP%zvZflOBa8+C-mm7od>If&|yA_qCG?-Sb&ZG#p`);vAWGKE>DHOExviMcs8I@JXlyJM!< zy%ly$j@Stk?2aJ@8L;aCw&f7>FF{@8qYd)lO6u&To?BstEEH zaFF>8)AO*?H>l1Lnw03KADUn?`%%1`1-}oeQ`$=DW@sa{fpOI?Eimpz>TP0Hi^Mjw z%uUR%!bYiZ>W7IHIj;p1(?*Bvos4=JJ!i}+V=kFq*R5qXImNW;gNC6I`Wb_AeUmM> zTbY=*jJ+g@7JX0=8isO@S7Mr5Y#7@_=>}*Hnujc1Am*O17suU3UN$3XnmiBc(3Cfm z-c%|X_btGV^8CVQ8c&T8u&OJ{h)eR${Uvkb9z^STRA?+e+SMsW$~p zLzWt=P&$#IDPp$OwT314(-zvgC%lW=^dQmVZ4eeR%rrqstyOw_3o)509Xbe|tQz{L z>48+7`mI-F+;M0M!2|SX3uC+~%55y`6>00naxUYPx+P|aO+&`q2$ptG@9)5yTB~&P z|4DC-%dkl>r)IoNP08$*aH(HcWPgaxJ(Ii(vo;3F1#Qz#u^xCrX1oTK#O0YlvV{(tp;!A zB_E5L3Vw^$$I&8tO4q5EDGGKUkI-TsqPu?sZ%)6;T&uLnQ?#fu#{Ug{%xLGJ%L)3P zn9@%ZdjegD)S9B3)cXO-D~$Etr}Q=}x87e~l0;3=w%qP?NxfYN~ven9GK_dsAty9 zq0%RY$G zY>_cGLt1tAf6&5N_0z(aty*=zxDRG&q3J91d=oM+W>Tvf)SIQAGBa+>JZtr9#!iL&%#bh&Du}Yd&Ot5_sHo2rRHEgF-x}-+XEed4ng}MXEjgEGvi%s zHuNib`&ciP-E=HW_b>zf_K<^%l%{)$;>M-UFGcQ`@#g4HzmisGqFQFmoNi(EKWP>6 zQ{ygr(Q1kuZ5u5#y`PxQEuEz_Wi^!zt=^-p&Ku`BUmAY<>7@tq{OZ@y^1Vcp#@__~y|c8v38mhXX!;3OpF%0qw#c1d#?Wv2OvlPI#?YmdbIDolV2l(MDNT_drEj60 z1~r``{a&Q)HRuL(o!p;?PEz_cbPl>iy_8k`O8&O^dwRJAX~r|C!DnRrPsmc~PiA#@ zHf&WHL(+7fq6H0-kTRHxm1ylAFA~$Lv_xq&LHf;?#+<*Q#Tn>2bcejy)?5A%^$t^S zFSJPMD5O}ir7^9h$Y+#R z&BkYp=lrU~w4fQ!Z_4T=+FoF79}(LDy$@}ND$pFH-_fQB4)RpH7NJZ^SvB?;gOd02 zla|=KkFk0Tt0})nn87E|7p(j=RG?JQV47ks8NK*vyjFci-J;$V2GP+`Vp`otOuq-{ zu}&Op=9m8R(M8s4rzzL&g7i@T7YQ9N9?Himo98+2ka zy8dJ)=qOZ;P-fb`Br)e8wWdg|mUhrqtzJ5kTQ*NI`!n>SU`eeha&6MrtXHzXlZ^H@ z)iFP{euBa;pi@Y?!;8@?jPV_G5!%K4wnJ`NUmBg@73!xv;f`W@X*wEz9FTnhX_Zj! z|K@10OtG;%MGl@)?|0}S^ay$a`7*-~zZ#qVhPGZmRbtX-#Lhzcy+ABwdJzj7Ap1Lo z)$`C<$XS_jW4jnPMO8{|@kv_*mwJP$BS9Zmf{q7dry=)MiJ0^@tI@Kd7hT3M#mae`8Tm{z4{l>P`^g)T$iC&-N7q*T*B zI?c0Wc8zJ~6#cn!N0Y8nPjW|`pw!VmO~j56)2g%5DehvezNGCd=x69U@lrPI`N z+#iYk0NsF`)fr;?_1-v6siSG%Q>#J!?x3x)T}=`Efb+YjD`Hjr9>T9{Gi$fWRZld{ z`l0b8g(`_$9 z9zgdJ^pu$Wd1-r8OsbFFqqMCiNFk>vmE1aNwN!B@Y3sPgY+=lqo+6XdE?$Q39m7>hLG$B5UNDy;l=+EW7qOJ-F6JVc@zv6E#_&Nc>C%{F>0{=iBQyRvV=O_{ zhUD=+Oua)1vS)3rHg=XdpNF*Sr@qb2F|dD}?B8Au^hD{{V32=2Z4NZ;Xj)w#O>6(( zJ$8;(Ur@SQt1oHs4D$M3Ejg~A1bco{RAsbxr~S0mV4fl`zPb9GTp9C4p?-ClBdq5B z?f@ap2x;w&X$=eojd6Zc4-4l)Cs{F?X6u>rBVwzyYCZk_NiUBf{aWg1TFp~r_iK7N z09F46MSoS+>+jB_&$&BKLODk~Fq1J2N-a#a70Uf*^Nt9%aJLrvBIdUNOiV<~1N>El zGPhlk*Z@>y!Rl&EO7b$6l%!x~s@gG(+13ZJT2oYI9eHXbvxuY~lJ9?7NQ$FH?$>RN z6}B-gsht>Bn>capT+7A&s8=orP2u-+gtFVvaSRSXy_9wnGvliz&Dg?+s8%IgxJ!&l zzcZ_&&;h8*>~qI4R~mlHm?`0-A1WrOhnRnPoV!rj5zBvi8b69FM5uNx#!qKJ1~o(N z-BH?I3>xEg)#OOTW+sEw`fG%es_D4)r(%%~-+-#CF)7n}it_+VwrG6h?N8}9m}yFD znf0nQM~Ev!Iq8Tia*y_?uuX*>jH1G>h&6KxeT=SK+Z)9m(oQP&QaaEd^(K5}H5xGu zUy4w66S@K|ks~^GW7YmZ@b9~R!5FWglxq!JYRsMRj9%<7$>c&<-u_34o^;2(zb6XjXUi?}bziR4y6lPbU%a9-U zcH+{>v$VgMj>hIWMK7aTmLd&G8Z@R~Nvr<9sBf9QE;lj*V>xPy;xebT+!3)7hp@jl zV%qA#LhC@3wm={!%VeG0(3zuO~F+@(FX1wEBor-wpd%-bkrb$^NQt{GO*Yp`>#@l; zXxVB#xSkW$M(&%)eM^Gci4`HAowLMrnIlR&xr+;&+VW_9nzet%$Ak3yS%k7v&}rxl zbOM+AF%a4?wCq82mRIWO1P56SCdtmf+qR8vdO|f zSHAxyo9wOCulrrMHla25$LnZlfx4h!NUfVtI0f}UtrEw!btKlbek`bOBFG2u#}Ueo zL7zg$p<~G0j$q#(_`8LaLJw=IG^JIUlD)j(x{wYq)45gB@?l-6niJfN;M&*dgxAif zIJtao>xMn8DXqrZkl7DSLJA&4p?7c>v36Rta&B8Vx9iq&aJw-)H5q9*7?ABx&|YFY zAbQSyfkQ^lQw~=f)27xX53XLF)dKT-C&P7Jm8MWwX@P1N^GcVKUC=uV?m*1|G!Ch{ zADL?PI_}`ywvEIx*RAE?wj;QRU|(bHi58j3dcP@xTLW^p9Jf>M)$}leFF~u-`j|14 zscLU<$n2jaz3GnSgjewH9h*R7>V0qTXiAusbz zIxLhUNgbT84!m|kB@A!i2=9ufnSTZC7uIdU^(^(6O76{hJEgT0`PM0-F9I^p;R9lS zBm?ft=Ku1B>8Q8ezjVu=5^(#3$N>0yDxIG;i#AU?-0hICa4AKg1RMS zc5z<2Ij%j(^tk#Rw0=IhMZv6hYl8g4l+BcyNhaVsgxX@muP*PCg4@v51YIX~1G)*_ zg??d-ZN!{alKc>2t|Qv`g^F{?+{gu0=KT1@zN4ejc8ruu88N9qOi3kTeub{DfXgT> Xa~>zqRjI@b{F>ecVt)DZZesre`t4^x diff --git a/GameServer/conf/server/data/Landscape/h0x56y47 b/GameServer/conf/server/data/Landscape/h0x56y47 deleted file mode 100644 index 5ca176c718f14c501ebe4780417dabf4a33323d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23048 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 diff --git a/GameServer/conf/server/data/Landscape/h0x56y49 b/GameServer/conf/server/data/Landscape/h0x56y49 deleted file mode 100644 index 714dcce748cd9b3945230703e25342e3757140f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23045 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 Az5oCK diff --git a/GameServer/conf/server/data/Landscape/h0x56y52 b/GameServer/conf/server/data/Landscape/h0x56y52 deleted file mode 100644 index 386b4f8c906e71eb5e42f6a74f34c5159744d6a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23042 zcmeI2e`K9m9*2)k|Ck*!tH!9=s)&e)xb9q6M5ZdDDk9>Fs)(p~U01{vS42ca)hi+* zDx#vQqE@Y{HO3eXl^Z{5%l*EoJ9=blF!jML(KrSsGnGg)UxjY=a%!{p}4eJ)S*JX)>Q zuQ7w88S~+4&@8!fK1Z5rV6arOy8WaTl?MIl*SFI__l*cMky&sP&;_G$<;q~ia$U%c zlfQHGe)a2HaX)>iW)_loOa2(d+W@v)g_yno%|mN;meR7(WEF~_^G0nLl*?13 ziT3qu`)QXKr0xJCYYCTC;%$;NH;T&=Gy!cv8%7s`={Wc-F)|EszIMjqcC2Df>AqH>!J@8Ag#1|&smLD z_j{~`TxPaa6(2-d2@9iT+8J9;R`uRP)VgKP$4Gq~zsKk=C+S0NjM;ficaWBO&#m63 zt$BZ!FoTZ)9661^vZ{BX73#(ibvrm;8*}n;{K|A6ev9O`rr(y2+N>TnjG0Mj5n6&2 zp%+P0-%#3;#r|urAoz6zx3LWGfO?poyP(z-th6}4Hw+DBk`J@A z;2y8>Gqm0;~HictLq)U-p%%IO3$-$a~9f=@@`S;KLHa?&dLnY%xjHu%NPGV0G9 zCr>FFA#E56rqhB$;a<`zfzo3?q`6b8Bn7b6*Nb+s6Z1w+xmZ0BS#BHNa*#|b_ZYbv zmQRw_N`8O2p?c)${c1&&WnWfT=_PBB-eR?Hr8M;eMR&zI-Er?XP825w6KuzptSV~d z{B_E`DDk`3-Z_Tf5a<6DzjC=dX&EHHsf=Jm-sJKM&PD16nt)jtzg`Zf3P(Ol{_%I4 z$6FCnoGVt<4;1lxZK1+^Ilu_^Uq(zv0M5$v^(54eEpn(Bbyh;o~xnojsp@>(<;Sq;%y(vp}?3dnBfQlkN>!#(3e&%eDpKBZBS3wO@4euyTJI@GQhDxi>4$ZY%hl#Yop-ARUNmfTA zf4VrFQfcygG7352Xeai&p%=h!@@(?k=`A!GKWpa9O4DjdDOxIogA_q&1ujin4rc;aA?cMw3BiScea%8rzK+=+JfIWJa8wbyFDdIF280}ST!oH81+)Fcgs4&5Eh2A{Az3` zLUY%=!9-^6dc&m)ro%mX)0@z$|1&Aq!zhqr)!d`Vi$c9{XpNLm9MXF5)|Ew!=;|9S z>UUSGj$HXwB>&WOXcgbi-fwyY)9F#9M-++QbNC&UU#+hc`@Tn{M`HCq{RZdBk=ug8 z{zh7kcj6pxSvlfY21S^TAt%2o*N0!Nvs=n9-ehohYV$SXq$S&-PN*Bo`LQ@HSAdFs zEtRGfiQhB$9c}WPTp;}LzN+0Q8=w6MtoW5*KT?N^e)Qf5|AwOwC;tQ@lJ)+ZS0tCM zoUA4;llpqY)$V0~#cB*w_i+2&-F{Q9=30@~%07ORMssJq-<0OO-;}2O8%s*V7H@Hh z^;Pb&YaF?&jR5uIGsMV{V?^%_k(?Y^rhAx^yD=@l$qr;3Dr*HL(`PElY5mXG|F2)| zF8suA+A>42wa}!wblbd?u~reYou3wzCvHEhSOf>vPj^Eqc=p3U$*l zJ2_XVm1B%3vS%s3$#;XKY!@H%`ylOJo+GUV;@6L&jpLw6u`1Fvv>!oi6^P3MakN7_ zFXDH?EX4h*cJuu{l2ez#bZW2{(*-C`KS*Lf^~+g$_%@N}x|(adgSR+bv3oN7hNHl& ztGDBcN}A_?hiKjZJ!yTK6h!pqKRv*xQ zv(Q;a$5W*BLi!5OOW)8QquytU^#L>wjpFwV zGzbkqr>P<5{aEPBa4D-ImDB$N(5!o&vs9o1_p4YP#ljSnwQDbLvYJIVIg3Wy4fA$_ zxGc?^xBJYd|EyZtmwUAO1wI}^A7X12sz4Lad1{P78as#SIYU^`o9iHH0~w@T)g7bU zB>iQYv;*>+WpxZ66-ZGlgIRtR$+xI`&0IR(H9D3pZEDF3ezIUx*9eT?y8N; z=sL6s$@CId=b#y`R>4QayTRY3;%R83VzGhTjH*XK1x@gsM>)5Xo-9ON3k7$?AXpQ?=_z=1S-G**J+t3CS zL(9+tR%={M7G}7Y3I?NPd)_F9E*X_sWlT5TsGO_POLUEA@Vk4|%IXBpXCRHw@~g3! z+4RT_dye0dHoj@z{=8*WzhdFomJ*HhA(k>q{ntedqzXRQbu0dPSIut|8 zk=?zl&XcRQpT$R&dzr!N6#Y4(4Q5E2!E}`#tMkos2M6R=?>+LXxYYks$g-+(o7OIl zCmO=m{cUr!bMB;F z53QWL_p;#~gS8#A|30I@BU89wW zTvIe+dJdQA_lxj+i;O;t)Lq1{XkUKia<3%6qS$=st9d_u*YNu(e%<@jxCea<5y@+e z)OYavEq?j#xwQo~HE` zV~(tfj&9oN+&V-gH@yj8v)m14;_L64)j!@ey35@C2`lNZS(iNV`~2zg9r5uwKDHo@ z#aU4+mm=9$4f&nLbPdz19-g{!4%d}=)`CWW^zgcfZyIWPRtg?4_Z_X@yL2P}= zTk2Q5xqh`~<-WWOQR4~Y?i0rGA6PX%#_G33t!CYCn8E&n-& zy5F-`^);j(@g48FPl(m;7>oaf)rXAA@8EX@(wtW&P2RGsDos(_WR?D+RoXm}tToaS TrZvNAe3oC4B3ZMp-oSqZzf=|H diff --git a/GameServer/conf/server/data/Landscape/h0x56y53 b/GameServer/conf/server/data/Landscape/h0x56y53 deleted file mode 100644 index a3aa0ebc23a60ba8efccf68848021879fc86cc36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 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 F^1p+GdKLfx diff --git a/GameServer/conf/server/data/Landscape/h0x56y54 b/GameServer/conf/server/data/Landscape/h0x56y54 deleted file mode 100644 index ed826d4b3ecf9c8a67de824e64ab0eb8920252e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23070 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 diff --git a/GameServer/conf/server/data/Landscape/h0x56y55 b/GameServer/conf/server/data/Landscape/h0x56y55 deleted file mode 100644 index b07c713a4302f3113f09f173f96bb3717a5d837a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23041 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 diff --git a/GameServer/conf/server/data/Landscape/h0x56y56 b/GameServer/conf/server/data/Landscape/h0x56y56 deleted file mode 100644 index 765cb574fc55dab93c5373e7a8d6c1913e0fdfb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeH^p$z~*48ywr$d4YJtPEfhkdhQy_T6{fzEd{v*tM(bs>WYeS7^ew&y~h#*RHCo z8h>3~p$XqUR~n;TyQ;2g{B?DOCVcx`X^eL5s=BK2*VPr8@a=P@G1|4O>Z-QAn(*y&r7_yI ztLm!8UsqRX!nesb%iE;`&?;^cI~RVs`1y= z6`JtvbEPrbwX5o?#$Q)gXu`M8mBwh-uBxjVe_dUn3Ew_f8lzpis;+AMb#;X%eEVE! zjCSp+x~lQl)fJlX?Q^9u+O@0ds>WYeS7^ew&y~h#*RHCo8h>3~p$XqUR~n;TyQ;2g z{B?DOCVcx`X^eL5s=BK2*VPr8@a=P@G1|4O>Z-S$(fk#E3p)S+ diff --git a/GameServer/conf/server/data/Landscape/h0x56y57 b/GameServer/conf/server/data/Landscape/h0x56y57 deleted file mode 100644 index 8f8d21121c80f563c5a0182af1efa337a2507b7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeIuF#!Mo0K%a4Pi+ZLh(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* T1`HT5V8DO@0|pEjFz_50S^xk6 diff --git a/GameServer/conf/server/data/Landscape/h0x57y37 b/GameServer/conf/server/data/Landscape/h0x57y37 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y38 b/GameServer/conf/server/data/Landscape/h0x57y38 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y39 b/GameServer/conf/server/data/Landscape/h0x57y39 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y40 b/GameServer/conf/server/data/Landscape/h0x57y40 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y41 b/GameServer/conf/server/data/Landscape/h0x57y41 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y42 b/GameServer/conf/server/data/Landscape/h0x57y42 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y43 b/GameServer/conf/server/data/Landscape/h0x57y43 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y44 b/GameServer/conf/server/data/Landscape/h0x57y44 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y45 b/GameServer/conf/server/data/Landscape/h0x57y45 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y46 b/GameServer/conf/server/data/Landscape/h0x57y46 deleted file mode 100644 index 7a1ece470a9d95e427cbc9c8b2bce099ecacce96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23045 zcmdU#e`MTg9>>4C*NwZgSKD>Ys#8@JwN_NEs#+BhBVvq*h=_=Yh=_=Yh!`=xA|fIp zs;VL)A}S&(s#ZnST5GLS_s2Txoc&|3&RT1o+jY*lKh}MJ%;)ufX7kKsW|C&J`KK?R z=lAFJJkR$#GtCF~H)aqFLOoDB^a0f2rQZ~zA*DZ_IN2DQ!F9$E-67Wgx?$HjqrL{C zfj5l?-+|sW3U5KpPz#hf+f=aW1=G+d)CaXe??Ws+$PpV3EcgE<_Uin~rH^hi1I@mN z*f2DX^NF`CIMrwr(oHCuJ4flfhg2F;dg5dg4f4<=Gy*9vEG_7zGz*R5_eY1U z_@qqR9@1SRzwg;#!A(eW?j|+_$?w$L7My7`DzJ@xe&y&cj_y~a2b7A`c8OB$2#ryP zeOpEl)=b(5y3uEyUd+NtS+%aUb9`2>TD9N?)C_e%{m{rc!wLLOH(IQ+-&K5UdT4`~ zXq(tBvp8y*tya1V?T~w!UMD77GWa2-pLpmQu}6@4*1lSx)MvWUCK_D9 zk!#vASvhuvUX)$++(6IA^J{a_evwtpK;!EC>K;c&(Du4bI{Ry*u6K+E**epn=kEi$ zQSP_Mvs}urNT>EAT6_V02`Tm`Vh50RiSBlv=|)>nAX2V$|M|RKqU|3bwRKw@HX}#X zJGWkB^{QuFmFoGc^V>p;)&|4Od86!QqaHTL7>z@$%H>lsF4MY!b>2jB^f_(6fxd&j zg}#FR0(}hW-jHeC-i@}P==|E>MT0>3tKGDE_R(9;nKo~(^GY$zN~AFm6CfsNechIn zX)tPi8@g)h{t zYnVlA8*|9;nXetK-7VH)wACmN&5=M|#?q<>>vQUT0!i>oViG5r|D#m&A7W~uYd|y5 zQJ&(FGtyw|7$8}F77F^IK2K>6v2J>~$z!b%x(r={F497}-lacjy`dN_u1efZZrL{W zY!2#RnYk;rk}Q2^n=RJSV$_e!NoY1>r3FZL;To}BNUC*{>%_gFo}RY4jeV+hzO^|% zqZd7u^`K-Zy0hP#BCiyHU}!@UdL zQ1KT=g?HeFCBuS^|0nLD||yOAidI=R!NP+~>WK0`feUnQmuAQ3uq2h{r% z`YWXK>JzICrIV`}6j<*pcVGUpWk@G{6gR!(v>j^sqqR_;Tgh%KJ+~1103S`Xy~-F@ zFnAfdMrjlG`fYk{XC0k9S-M5KdvVzV4UoxEXbQ?hvZ~l1r9DtTr2b@oj?xwAKC}tx zv90_4Ii=bq>P1#H#$>aZnIs1jJd-A_Tj@BjA7dg)M@6)4zGZDQP*%hRnc-~RX|xuy zpJ5+#P}_Tzn}KqacCwqgaFpW= zwqd^=>ZG)bwte)ho3)p7DXX2tI?0Pn4-gxJlxJBLWvF)zdJnn|`JA^=nu9c#eqzJW zG~_c_Ii?qg@zysISxw)^bRlu>rIxf_aABORjd`e*SQhGnbhdhN-VyDW^smiBS=Ga; z&Z_dFbJ;~+Iy@xPYM~RQ^DC>$q|UF-s;tU%6XU)Q-GpSnnV4oO=Ne5jsGY_$k+(!^ zLP?^{c@X$1s+6?w`IS|jBb~BAO!q-*ks&5(BbI~Yw~q|zCe%q$)_kNEBlJ?)uS#{> z>P*Yv4f?y~A=SH0srE}dG3~!;VkhJ`b3VO*1IKy14^sQ_XsKVu)eWZ;rJH7)dLq@! zQmR~uWJ~v&tm>?)7qw8X)Yf-?HG4gEeVNpmRz0=VXdkemR>)^se(z9EE7zO{D9uB@ z`T1hr^Xs^jRZ%6slgvQ7PP0->XGR%UhD7ovt38aN9LTCjZM6^7i}v3X{rNIfZETcY zw0E^i%}OqtX`%Bgzq)eO6C)e)A@bGJ=}}(PLb>1s~H>D$&2qE_tiV)SmhOY z)=|s+%KBZ#?>>GX#%#2WS)=tOqs>*L zJ?IIv3*E!?{JgaY**PIMNS!N6x;&k>uGMrUxQu)ht@@~pY3)uC8Ny6WYb)z_nYZDM z9vfqQ+~_`L?qh2mgFAPv-XmxaQoSYGhTH=6+}Y`9P2a~WPrvgx9f}MV^H;&8&utwgX z`g_2;@?@|Tc!V8nuA{>IePvTeRHy$m`2H)p|tj$Zi(Ogn*-rJl0 zeldP!e;w01?dD^fC+9l0RxlXygq?x%d28$V9ky7=9iefPd$+hJqwFSs$GVHV=%qL6 zw&*wcC+a(lW9b+@KEkhV0q5x)HB9?E<9_ufy?|ByZZMxKrXUD0Ge1KNzf)M9fTrYE z_cOhmir-HB?nE-u(->3o7m6Md6YW&?OMmfgTfCp?#kqlho>+kyh-Qh2@*Ot6nNcWj zG+j7MW5gz?H#=qZ!V#z&Vqcxm`F$v>qG+`8e!Zsg`-ol!p;D{AT)$mrAwOm`gSVMk zVpts&Q93ql^`_Y+;j8l-pS<*h_CWp743bHNF{P!IDc&WiH|>```iu8u+FwjXziGem z8J4#IkI~C3yr1(} z=odw^PqWc)>j;k^{A$0bzccPv{~Kea)7E>BH_KJ5u0TteS;U*(kf(@^LPO9XeusEB z8(=hd7e_fQ?n%rz?=)4$W~jFT#V%{}tM}(K|9*A&{Oa2U{ZhEbXO|tU?ql^4w8^&> zs~8L+pJ|=sG1@wxl$_fv@^O5>+7Si(ZsT{)_H*c?=<{#-7wUd?PA&Z%aeh4+cW&is zOPPz4p^{iJSM=8gaW}0FTZ;p%e&M0d@vC2gcd>dOnuDgHNoZQ{-ug|+nf(d-)k%&% z!=`JGzsahal8WxP8nlh}P_Y-=O(nk?rDdhxWz-%sGwuyn5-ZM+p4%b5M_S~2i|5ck z@cRQ+{|UW>KF8LF+`wD7)ajn5w4n1_&TqVcC|5cuWvIBeGNnlxyuFk-PqXEGds#Ye zUEe>)vnS8TqI7oU-q+$h#WkGKIKOj!*7gB;{usY6@%tV0Empspu(tC19D{q%8ng(7 z`XtQLz`r|--pZS<*Keu8WGUW#5Z9}FjHu!HxN9f(b(pq1`!f`k{?spH%;l`@8aMT4 zWc+KKe+PYo-!FMbdf_?0+qk?7Ip2uT*7>Euxu0!Tr7KF7aUqT+lzjep^>iG+%DsO@ zX|!~eb;Qd1C8ukc{Xr4YUha|IgLa$CpR-0^bQ-~2C&p-W7^3Ell6#G|oezk7Sjb z!TbE4GYt=hugBa=@FLa|5#@9IMR}~dsBV7x?0a}w!8Pf=>E=g z?)h<_&v~A6?y1|;8od+^3`EJ*O4Q|4IOR-T>haR#E_Y)*>hF)Dc+@qK{Lw(wMlTKc zK2qgdaW;2rRwb>t;_1A#S1Fl#f5uvVw`?k^NWErq8a0C&eN|OT)%(;b=c86Gv30BT zK5xq?;~~DHx^j-Mp9d*R-%3~|g|55;-!gp1;VaVDutgaKOYxO@#Yj7<&Zn(02o?fL zrRVv&x_$6oR;R1=m3`DQ2ckjlpsV_1m(aH&OJfUm~M2sHI*tz$rNA z{Fbnm04z0$EssjmvU6b;uwi(f04|d7r^cw)YxAXbYUEJ`LV1c%7U@Yy--PPhsHj5xN{O%3 zOB~a!y!p9RGT*nRv7J+%Or~@y>RjS0CBEWTPm=qaZ>E);aEVjcLQxb{qm*V8vHt?b`I`8m8u)LO4BSjsV*e7GD(?knbFR+V zl3kkjZ!?$t?W9OQcl>(3%%Kt)BpbEQ%s0dGW#g;(&5%~6CX$=!{>nKnW$CZx3`#b3 z;ZNlIJn`%6!neq}FjejhD*7-JwIXe${YR}xzsT{c^;c>g|7lHbrn_tR$Qiz(DkZ+@ ze#q7M8ROTjzXdW)X~MWEl1oqFYqW;hUu6^-csQUUY%h-5#8+EV@ZG|HnfO)IN{KIT zPtCD}uM40!&D8F4`T4oycao778EJ_~F2XmTQ8o{vs__lJJ-vVgd(SoTy@l6yr0`!e zIV$p$n#nt-l=oIM+2?d@$$?@=P58f~DCQkDeN%FHlQ*EOa$(tJ3*F}_6?i+=IY=p; zP3|g`P35anox&)?SEQwg>E2#@aZ1-=srcQ-Cbh{?;5ugtDQSPjQk*iyoJYjGuPRgb ztL9)?M$Mq6rQkcoo?4lDylQ-hQ9;r#UHmp-sr^-G&(+kPi#=-$bG^l;|UV5hoHeB6TX4r&|kwkJDO2ijxL#y8F07I_V*>SSB0!TP&8X*HIaVGE2( zksOJ%SoW)480Mn7h$rV!b<{jLc8R=u0Kw1k-viWrO7#}qp6KwsY%!hW=f`4t=%+U8 zLK~{R`NoWInM||9>C8N1(VASz@UUL~>0%xSatZjyKP7Okk&Z_KOAh($8Z9B=P+a!!pARLR-eeHAi% z1Ej^WUv=Tk6}7XlETd*nRs6S%ulDej;#YjX!++nP9-!J%%!oE`S=*=$c1vp+(&l?* zAFVUXjC2mtb>?J^(N`ILnXyd4cLEhDYWt8n+Wzeg@0? zi&lDf(YPJL_cpdY)X|dFIDx9vA-(NX?7lWLEQX9ohxp2-jHI<^3g(f#Cer$}I>b!` zw;(9ncECny_4IP*k)Eb#Mf7`S2Jsz+)w>Gg`Sz%V%}#cMsAVWwXWP?3kRbNR|@cWu8|jpTXY^6mKQG3zj>P;KM;19%*hcMnl}Qsm;jK;1j= zy@$GwQf9crSoVnXHhZLa!hEGj7GJ3l=^)=6RF$d4S1eK0GymJy(2uF|xhtc#u}Pi2 z8M#kWqUuvsr@fS~mx^Smo_zld-y1|q9;!9StU*--57;+p54_7Bc$fKdK+AVovHwDQ z525-9^$qF^M(_!_TsJw&7&Hq0~GP=_`1n$ zq&-#tRpNPDhyFgXD$;$&FLgtin*3ab!Wb%tU-J0A1j~8U8ms9p@2iL8#6zea;?py7 z=L2|r3$5><`ZZL)L_H*LJcR03j8E;|DI2XFo}Ql@59j9#bCWynmIeg9EZhM=PMBW!C>)k)SKp4=;1EBmx} z0-4W53xZ!PTa8aq$CMsXL;I^w;d>8ScPrM4#?qQJTZ6GIv+mdFBf>9H8()d)F190- z_})o;A7JU%s|@o{gesCxLIiu-PS|N_^eDY0ED~=Ed;zh@ZfSYWk28u^IfZE9Nu3>T z5uuxSe0$!!yN4(5K=3~56VxH<7Bx2DyUi>)hVNZ^i_4ds^M`(n$1lC+M;#X~z2@IA z;|jKUe_u2Zuh{sa7HSiMJE(osF^bi%n(|Gr0aTPxT6O#7E7Cnwvf8J7{dK~q$j^F9 z&@bexe8IE|-v)eRyxU?=qu+(rv8}^n16td7@&I*8=@IHSYKxq`Nfy1u2=?K7QnrVT zClhWCW}NR3jGWEgVDyu({^lr6dvi5DXjv=K25JYjk2*q$uOc~R8OqeIQZOs`AeiL) zV5w#03}4MU-h}n5YGd3Yw85`8jSktwxkB5ytM zpTBQ2q3YERw*Az*&bXHJPi7et&3c@YvL~3~3@+Q7aXS-ylJ<@?)h>h+3%XJwEdtBYfjd{3cZK zU&_~CExg;NbX^Jx=lS}&isUT_Zo^l$O{ngW1@;-iAtN{j(SSS5 zsGeN0Q;l=V$656xNdlewXhnS-la&>Hu3WsRNHuboh+K+3oUWm z#kQ6z7r!lRF;t!JonO+t;jiPWsUt>u#J&!y11QhjRmx=QP9!JmG|!=T`>BTYk#CzC zCX(MElA{AFjfmvv)NEH#I)zA2AnmLQm9XsCGRg=Rp!$yb5LLauNwNOwJjb2TJ3nXm z5+90RdAudkD4kihVU$tOk6Blp^8KomETGjs)>x*@e@{P)^s$gWrJvjBn{dZgpp~+z zDs!mBTpMp%>Gcg$Z|#`+#h$6?(9~5Zi0@Uh_aw|SDxvDHNhu;!RHY*E)lN|F=OMoN zqzCWkz>{l^XGlXe6Vs4cLp7zSp;_XT?^mTYd)}B>)z_M#--x^~;tF9JDx5L$!q&4>8PMvX#mzPHK6dVdpXPTIPB;QgGE zc2_)!nnB6;;?Y~xsVk*cQsw&<%Q7`WvD%wpzoj|rW0~AOOK-(lE6tOKM#$MiZ7Y3? zoc$X}4<1BXJ3zPRPU{$i0MCx^uCq851IUl z*~C|>bZVtj+&2qfk&cdRb&eZ1lk}-S# zvez|c*WvTnR(VQ&1w2jW%JGyV%;I54f6%b!ootyZZI~+DGBwURU1Xh}KDN?|Si*M> zTLTqSqm7a+W)8*l*5w!PXP&pK)D0)&`@D@$=l4OSx$z{`PrtoK^|O@fd)pc#oq+U* z%-GRcd-4g^=`uUU`l^-AuAw$f)!3WWp)e2gMOdz&VpKbzTG$%L*2fB}i{M51`J(!D z4(akimo4)JBJ;UO9@1BsOJ(!!YRy!Uy?|^7BRY>zvu;gD2W_Rv%KqR*3k_J6-7QliVI}!B?xPq7k)#nnvYNqp0(vx`Lmb zaQ~7pr2H7p*A3Z1bwjq!{%VwGdzn>^rzFc~qC2LPy|zGGt3@MWd~fQDM*M06N*X zwdO~oPSvPeHySjdmeD!XJF~SO$917r!>To|SE<=r@d!GA%8#!x;dcyUt0wnC4{Qgq zXxbeN*y%ZR3Pl+TxeTmfYn@*0)NEJ#helPZC%CL1TeXRg1_oOls}8zGeG%1u+p0az zZDYTN^D_5{>vl$g9TcnPcUZRS@SaV}s>t>-`3aL%k^DBXT7;s^ga)jtO8?gA^EMWW z^m(7-N?0i1DCUfRj|7m6*hH(R_NF5sf=NqOsxMt6DRo1hAPml{dTaAg?G><7T!avRNwZk zf1+2cEkSRfRcM{7Y;)xuXcy-(&SRYKVtSXSZoh%wL)%qy$9~oO!Iiv?J;Q1ly1{QBt3k4RtYAToUgGG*z>W*i64hra4?Ls#gRzhon<@#Ly z&7mx4G8Zwkh(fuR;RUMmPz23$6*+&7>19m6VV2)wb>-Ohx6T{*q-<*~-oTmxbxm)$ z9$izl6Ij!6ckNgART|6c9(%d9Rr!@wQN}N(Lu&)78M5v^#o!|-uxiAO=W&>pa<$- zXr{ZIq2n@EsZPJ9>rJM~yT9|QJ*UdV5*GAq$hjOTEn1u*QdQ^bxw>5KXqKYG|i_ZO!cKn@5g5VYL<@C4P6kD) z=9J9u24;4k0;IQrDEBUN+HtbP_ZQ_f1>B6A83m(12i^mJ4#uAdJ_|kzJ_|kz;|};N z_$>G=_$>HWfhVCSp(mjyp(mjyp(mjyp(mjyp(mjyp(mjyp(mjyp(mjyp(mjyp(mjy zp(mjyp(mjyp(mjyp(mjyp(mjyp(mjyp(kO!lJJ}Vjn04lw-4X(E7KyM#(YiV^ge#r z|3VUd7vcOXH2szRj2t{0$q)NvNMu^1N&f7n|HT}a-yWu8C{lWBlE1j=f5)`^wy;`( zqMtV1(FInA0rD))K^BLeI{9tmvU*`wx1o&ROZ>{Y`^~-IE`IA+EnS-FC`0&_X_1@G qmFWbleXMq%8dhWI2Gj00Uw(PlCRpv`vJD+Whft)c4UwD9f$3jV_%?w6 diff --git a/GameServer/conf/server/data/Landscape/h0x57y49 b/GameServer/conf/server/data/Landscape/h0x57y49 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x57y50 b/GameServer/conf/server/data/Landscape/h0x57y50 deleted file mode 100644 index 70df625ca2b79f2c972d2741b8bfc6fd340a9b0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI4&x_+^9EVd!{3Ap>i3jl@vMeHl3_~fUlv2u2%1}xOC6pzUGL#TX2w_=7Wbv?v zMLaCxNkkS8;>m*t|1dM@zRxExFLnAOo!QxUP7iOI&LmGh-}gt7@mlYBZ+;wk-u*lW z104BK2+g3-sPx9r{X8P~S9zYS%3y@c1qMZP)AqxdiR1dUx~yjPjT;QgWtX--R)_Su0pqLr$oW08Rb4~3^xMJZ2pVJ6 z$7(n;E*GRW8JM;^J4zkzyFs_K>fv$#1z3%+x*)4dtgeQ}YSuO6{1#{87+2T@6}Vy= z3%G1UJ**dy)OgD- zp}wKK1GNk}zr~rT@7j>nDfz|kDF)A=Ce-3{LsFag##?>?S*+&HZ=F_ky~wZDpzwA| z-4&hDrrD1A+MK>NS8A!nvMQ?a+SO4y@;v32YAdUv4)zy(E~6^vROP%!ex2XrWYu;R zkEqHvzqo8eA(T>;^8lC3YjZ}(%4$Yc7Ps;CN2XgW^2y8Huv#M zuPcKoRuc==cx;C`LvQ!D=ziW4Ok;40)db4en&CI2*G&h;bd1Xg3ZNO}{MMS^ieF>K z!=U_%a<=B7*+X-oxM$j?7#u-;3pu|v_?1=Nuf^N+mXtE8N~y{bbD<$FJ5Up9L(cE9 z{e~95YKz#KGOCK13#kJ4FnA7q1Ie`WTZ3PX88+ruR%cjU(d(x4y34Mq$`cGKpZ4ne~paI)Oscoyaf!@5(YOvibcGs~HpZ?dDU)5)g zuas3;6*<3q`ju5t#VX?~vMRs2?>Ax89Q(!JQ~pF3Cyhqq8l(0}!h*%#;72* zl^^rUm8=rgCp*8ziPL;$dy-Y9wlXWa>9;G>q;^PEPI>bn>YX&aQsK4BQg2~!GZmjI z_jv5;^P#ND??$UymF(enL~3Wj+Mnko%!;B;;c}hd|FJ6P#kZ7uXr*$mYj^vr{h{m; zDwj4gwq#Xz>qn$^MrvbHo3d6_W_8E>Ub_75l3!)j>i4GAHd(!Z0{kvXZRHucuKAYI z@AmmEuZXepyNh3&RlOy|J-!|!znb+fsLEP_%t)=CeB9A*c}2MV7Ae`MuTWpR(XUMF zu90m8GV7Ss>S>JY(QqlN92b|dENOGw`g?TGaId4>=M24#`)Y)2vFef9KBT9qG{dbt zZNuIAoE1p<6>0r>PTkd=B;6?-uvKl&?-of`eYW_ORU2JVl`GFc_HL$DRz>n#&Tz|} z)WgcE?is4>q4;gK))mb2jzV*O8(D2Gj4eG^B??2cRWl&Hp2d5YW(UMDplnlu=OMK3i=6>^EqwGYLm7u^l5Bcf`V_F&JYyVg2d_ZzH^B{;RCYwAy~P_>E~(k~PkD zes@Z8CAFp}*4v(^v9UUV=Fk6&4jJ}?dc>>lJ#_!KQhBzZ)VXRL!L$u^g^Hs|+9el=sppzisPxw|wDO=<(4e_r5s H`~3a~Y%83g diff --git a/GameServer/conf/server/data/Landscape/h0x57y51 b/GameServer/conf/server/data/Landscape/h0x57y51 deleted file mode 100644 index 66f0b14eded7b76db0304bc74b61a9df50fa2ef1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23041 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 SjglpWf>lC4 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 diff --git a/GameServer/conf/server/data/Landscape/h0x57y56 b/GameServer/conf/server/data/Landscape/h0x57y56 deleted file mode 100644 index 765cb574fc55dab93c5373e7a8d6c1913e0fdfb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeH^p$z~*48ywr$d4YJtPEfhkdhQy_T6{fzEd{v*tM(bs>WYeS7^ew&y~h#*RHCo z8h>3~p$XqUR~n;TyQ;2g{B?DOCVcx`X^eL5s=BK2*VPr8@a=P@G1|4O>Z-QAn(*y&r7_yI ztLm!8UsqRX!nesb%iE;`&?;^cI~RVs`1y= z6`JtvbEPrbwX5o?#$Q)gXu`M8mBwh-uBxjVe_dUn3Ew_f8lzpis;+AMb#;X%eEVE! zjCSp+x~lQl)fJlX?Q^9u+O@0ds>WYeS7^ew&y~h#*RHCo8h>3~p$XqUR~n;TyQ;2g z{B?DOCVcx`X^eL5s=BK2*VPr8@a=P@G1|4O>Z-S$(fk#E3p)S+ diff --git a/GameServer/conf/server/data/Landscape/h0x57y57 b/GameServer/conf/server/data/Landscape/h0x57y57 deleted file mode 100644 index 8f8d21121c80f563c5a0182af1efa337a2507b7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeIuF#!Mo0K%a4Pi+ZLh(KY$fB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM z7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* T1`HT5V8DO@0|pEjFz_50S^xk6 diff --git a/GameServer/conf/server/data/Landscape/h0x58y37 b/GameServer/conf/server/data/Landscape/h0x58y37 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x58y38 b/GameServer/conf/server/data/Landscape/h0x58y38 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x58y39 b/GameServer/conf/server/data/Landscape/h0x58y39 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x58y40 b/GameServer/conf/server/data/Landscape/h0x58y40 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x58y41 b/GameServer/conf/server/data/Landscape/h0x58y41 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x58y42 b/GameServer/conf/server/data/Landscape/h0x58y42 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x58y43 b/GameServer/conf/server/data/Landscape/h0x58y43 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x58y44 b/GameServer/conf/server/data/Landscape/h0x58y44 deleted file mode 100644 index 82367aec27532df7f1ab792b09cee6b8825cb8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 zcmeI!u?+wq38Aqh!H zLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*( N2}wvo5|Z#w!UN}h%6R|) diff --git a/GameServer/conf/server/data/Landscape/h0x58y45 b/GameServer/conf/server/data/Landscape/h0x58y45 deleted file mode 100644 index 07f83b18be0735600d253ed6e713349ab047118c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23041 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 diff --git a/GameServer/conf/server/data/Landscape/h0x58y46 b/GameServer/conf/server/data/Landscape/h0x58y46 deleted file mode 100644 index 68ea30745d3944d88fe793fddb1d529d48342791..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23040 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