2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-10 10:20:41 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge Qweqker

Browse source
This commit is contained in:
dginovker 2020-01-21 20:18:26 -05:00
parent 3b4c0efd6e
commit d6fa053d03
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Management-Server/src/org/keldagrim/ServerConstants.java
View file

@ -38,7 +38,7 @@ public final class ServerConstants {
/**
* The setting that determines whether new accounts created will automatically join the Server's default clan chat.
*/
public static boolean NEW_PLAYER_DEFAULT_CLAN = false;
public static boolean NEW_PLAYER_DEFAULT_CLAN = true;
/**
* The store path.

37
Server/server.sql
View file

@ -893,9 +893,9 @@ INSERT INTO `ground_spawns` (`item_id`, `loc_data`) VALUES
(1205, '{1,3213,3216,1,13762750}'),
(1207, '{1,3213,3682,0,13107300}'),
(1217, '{1,3180,3821,0,6553660}'),
(1265, '{1,3081,3429,0,6553650}-{1,3288,9442,0,7864410}-{1,3288,9431,0,7864410}-{1,2963,3216,0,5898270}-{1,3145,3500,0,5898270}'),
(1265, '{1,3081,3429,0,6553650}-{1,3288,9442,0,7864410}-{1,3288,9431,0,7864410}-{1,2963,3216,0,5898270}'),
(1321, '{1,2965,3211,1,5898270}'),
(1351, '{1,2795,3161,0,17039600}-{1,2970,3376,1,5898270}-{1,3145,3499,0,5898270}'),
(1351, '{1,2795,3161,0,17039600}-{1,2970,3376,1,5898270}'),
(1385, '{1,3099,3862,0,58983299}'),
(1422, '{1,3320,3137,0,11141270}'),
(1511, '{1,3205,3226,2,11796640}-{1,3205,3224,2,11796640}-{1,3208,3225,2,11796640}-{1,3209,3224,2,11796640}-{1,3106,3160,0,11796640}-{1,3106,3159,0,11796640}-{1,3105,3159,0,11796640}-{1,2958,3205,0,5898270}-{1,2959,3205,0,5898270}'),
@ -19624,17 +19624,17 @@ CREATE TABLE `npc_spawns` (
INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(4474,'{3214,3252,0,0,0}-{3214,3253,0,0,0}-{3214,3254,0,0,0}'),
(7891,'{3207,3250,0,0,0}-{3208,3250,0,0,0}-{3209,3250,0,0,0}'),
(7891,'{3207,3250,0,0,0}-{3208,3250,0,0,0}-{3209,3250,0,0.0}'),
(4400, '{3018,10313,0,1,4}-{3016,10315,0,1,4}-{3018,10322,0,1,4}-{3024,10326,0,1,3}-{3030,10332,0,1,4}-{3029,10337,0,1,6}-{3034,10342,0,1,3}-{2072,5200,0,1,7}-{2130,5267,0,1,7}-{2140,5252,0,1,5}-{2141,5252,0,1,1}-{2142,5252,0,1,0}-{2148,5255,0,1,3}-{2125,5270,0,1,1}-{2148,5257,0,1,1}-{2117,5274,0,1,4}-{2146,5307,0,1,2}-{2145,5305,0,1,5}-{2152,5307,0,1,4}-{2148,5252,0,1,0}-{2142,5262,0,1,3}-{2124,5275,0,1,4}-{2121,5276,0,1,3}-{2148,5304,0,1,0}-{2146,5305,0,1,5}-{2148,5304,0,1,1}-{2151,5304,0,1,6}-{2145,5306,0,1,3}-{2134,5272,0,1,6}'),
(1, '{3222,3221,0,1,3}-{2804,3427,0,1,2}-{3285,3208,0,1,4}-{3093,3509,0,1,3}-{3098,3508,0,1,7}-{3096,3510,0,1,3}-{3017,3239,0,1,2}-{2712,3484,0,1,4}-{2693,3495,0,1,1}-{3237,3404,0,1,6}-{3237,3408,0,1,0}-{3247,3396,0,1,3}-{3263,3403,0,1,3}-{3210,3223,1,1,4}-{3230,3208,0,1,1}'),
(4401, '{2124,5273,0,1,1}-{2072,5200,0,1,6}-{2128,5270,0,1,4}-{2117,5274,0,1,3}-{2154,5273,0,1,3}-{2167,5259,0,1,6}-{2170,5257,0,1,1}-{2170,5256,0,1,0}-{2171,5256,0,1,4}-{2167,5256,0,1,3}-{2153,5273,0,1,3}-{2153,5270,0,1,1}-{2171,5255,0,1,2}-{2168,5250,0,1,4}-{2168,5251,0,1,3}-{2131,5264,0,1,6}-{2096,5248,0,1,6}-{2157,5272,0,1,6}-{2150,5268,0,1,0}-{2133,5272,0,1,2}-{2157,5274,0,1,1}-{2156,5270,0,1,3}-{2154,5271,0,1,5}'),
(2, '{3298,3185,0,1,3}-{3101,3511,0,1,4}-{2690,3489,0,1,3}-{3236,3203,0,1,4}-{3217,3209,0,1,4}-{3237,3217,0,1,6}-{3282,3503,0,1,6}-{3164,3504,0,1,0}'),
(2, '{3298,3185,0,1,3}-{3101,3511,0,1,4}-{2690,3489,0,1,3}-{3236,3203,0,1,4}-{3217,3209,0,1,4}-{3237,3217,0,1,6}-{3282,3503,0,1,6}'),
(4402, '{2080,5240,0,1,5}-{2171,5283,0,1,6}-{2170,5287,0,1,6}-{2170,5281,0,1,6}-{2172,5272,0,1,4}-{2172,5272,0,1,4}'),
(3, '{2818,3443,0,1,3}-{3306,3200,0,1,6}-{3300,3208,0,1,3}-{3095,3511,0,1,3}-{3094,3513,0,1,4}-{3097,3510,0,1,4}-{2699,3491,0,1,1}-{3231,3239,0,1,4}-{3278,3502,0,1,6}'),
(4403, '{2096,5248,0,1,4}-{2172,5276,0,1,1}-{2172,5284,0,1,1}-{2172,5281,0,1,2}'),
(4, '{3010,3236,0,1,6}-{2693,3493,0,1,7}-{2693,3492,0,1,0}-{2695,3497,0,1,1}-{2700,3496,0,1,5}-{3230,3204,0,1,3}-{3281,3499,0,1,4}'),
(4404, '{1872,5242,0,1,3}-{1873,5230,0,1,2}-{1870,5235,0,1,3}-{1872,5217,0,1,6}-{1873,5212,0,1,4}-{1877,5218,0,1,2}-{1877,5216,0,1,3}-{1875,5218,0,1,6}-{1808,5152,0,1,2}-{1871,5191,0,1,4}-{1868,5188,0,1,4}-{1861,5189,0,1,3}-{1882,5216,0,1,6}-{1874,5215,0,1,5}-{1873,5238,0,1,3}'),
(5, '{2817,3447,0,1,5}-{2697,3493,0,1,4}-{3236,3205,0,1,2}-{3229,3238,0,1,1}-{3279,3497,0,1,3}-{3167,3503,0,1,0}'),
(5, '{2817,3447,0,1,5}-{2697,3493,0,1,4}-{3236,3205,0,1,2}-{3229,3238,0,1,1}-{3279,3497,0,1,3}'),
(6, '{3097,3259,0,1,4}-{3280,3491,0,1,0}'),
(4406, '{1898,5197,0,1,6}-{1898,5191,0,1,7}-{1890,5195,0,1,3}-{1893,5191,0,1,4}-{1903,5190,0,1,0}-{1889,5190,0,1,3}-{1889,5190,0,1,4}-{1885,5191,0,1,4}-{1900,5208,0,1,1}-{1900,5210,0,1,1}-{1903,5243,0,1,6}-{1848,5176,0,1,2}-{1901,5245,0,1,4}-{1894,5243,0,1,5}-{1890,5242,0,1,6}-{1889,5244,0,1,4}-{1897,5196,0,1,1}-{1902,5207,0,1,3}'),
(7, '{2920,3434,0,0,0}-{3226,3290,0,0,3}-{2629,3360,0,1,4}'),
@ -20054,7 +20054,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(4346, '{3786,9463,0,1,6}-{3714,2952,0,1,1}'),
(458, '{3148,3175,0,0,4}'),
(4344, '{3747,3013,0,1,4}-{3766,3034,0,1,6}-{3733,2972,0,1,4}'),
(456, '{3244,3205,0,0,0}-{3171,3469,0,0,1}'),
(456, '{3244,3205,0,0,0}'),
(455, '{2925,3485,0,1,5}'),
(454, '{2899,3430,1,1,3}'),
(452, '{3223,3293,0,0,0}'),
@ -20149,7 +20149,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(4900, '{3210,3213,1,1,1}'),
(4903, '{3244,3214,0,1,1}'),
(535, '{2376,4447,0,0,0}'),
(4902, '{3227,3147,0,0,1}-{3144,3500,0,0,4}'),
(4902, '{3227,3147,0,0,1}'),
(534, '{2375,4449,0,1,5}'),
(529, '{3079,3507,0,1,7}'),
(528, '{3078,3512,0,1,3}'),
@ -20167,7 +20167,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(536, '{3192,3359,1,1,3}'),
(4907, '{3208,3222,2,0,6}'),
(539, '{3299,3204,0,0,0}'),
(4906, '{3230,3244,0,1,4}-{3144,3499,0,0,4}'),
(4906, '{3230,3244,0,1,4}'),
(538, '{3076,3429,0,1,3}'),
(4946, '{2721,3432,0,1,4}'),
(610, '{3027,3506,0,0,0}'),
@ -20262,7 +20262,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(644, '{3247,9781,0,1,6}'),
(646, '{3257,3447,0,0,0}'),
(641, '{3207,3392,0,1,6}'),
(640, '{3252,3485,0,1,6}'),
(640, '{3253,3487,0,1,6}'),
(643, '{3246,3383,1,1,5}'),
(642, '{3185,3385,0,1,6}'),
(670, '{2465,3496,0,1,6}'),
@ -20321,13 +20321,13 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(716, '{2540,3286,0,0,0}'),
(5116, '{3291,3675,0,1,6}-{3293,3678,0,1,1}-{3302,3671,0,1,0}-{3299,3666,0,1,5}-{3319,3662,0,1,2}-{3309,3661,0,1,5}-{3321,3661,0,1,1}-{3298,3672,0,1,0}-{3316,3657,0,1,4}-{3302,3667,0,1,1}-{3302,3666,0,1,3}-{3315,3663,0,1,1}'),
(719, '{2560,3288,0,0,0}-{2026,4619,0,1,6}-{2026,4615,0,0,6}-{2020,4614,0,1,1}-{2021,4614,0,1,6}-{2008,4612,0,1,3}-{2002,4613,0,1,4}'),
(705, '{3208,3252,0,0,6}-{3146,3478,0,0,1}'),
(705, '{3208,3252,0,0,6}'),
(5105, '{2780,3017,0,0,0}-{2766,3013,0,0,0}-{2785,3006,0,0,0}-{2775,2996,0,0,0}'),
(5104, '{2551,2890,0,0,1}-{2541,2899,0,0,0}-{2564,2896,0,0,4}-{2571,2882,0,1,1}-{2552,2910,0,0,0}-{2573,2900,0,1,3}-{2558,2881,0,0,0}-{2543,2899,0,0,0}-{2545,2925,0,0,0}-{2549,2905,0,1,3}'),
(707, '{3113,3160,2,0,0}'),
(706, '{3103,3163,2,0,0}'),
(5109, '{3443,2902,0,1,3}'),
(708, '{3215,3282,0,1,1}-{3242,3306,0,1,1}-{3208,3357,0,1,3}-{3240,3393,0,1,3}-{3219,3221,0,1,4}-{3162,3410,0,1,2}-{2962,3424,0,1,6}-{3011,3513,0,1,1}-{2980,3337,0,1,6}-{2997,3300,0,1,3}-{3031,3322,0,1,1}-{2957,3308,0,1,0}-{2935,3343,0,1,1}-{2942,3247,0,1,7}-{2976,3176,0,1,6}-{3239,3523,0,1,4}-{3262,3523,0,1,2}-{2865,3175,0,1,0}-{2855,3188,0,1,1}-{2838,3194,0,1,3}-{2806,3181,0,1,3}-{2827,3170,0,1,5}-{2788,3179,0,1,3}-{2753,3178,0,1,3}-{2759,3155,0,1,0}-{2603,3221,0,1,7}-{2604,3212,0,1,3}-{2614,3230,0,1,1}-{2611,3204,0,1,7}-{2544,3184,0,1,3}-{2627,3231,0,1,4}-{2595,3125,0,1,1}-{2598,3145,0,1,1}-{2588,3145,0,1,7}-{2601,3135,0,1,3}-{2598,3120,0,1,6}-{2615,3120,0,1,4}-{2598,3108,0,1,4}-{2733,3459,0,1,3}-{2732,3457,0,1,6}-{2715,3451,0,1,4}-{2715,3436,0,1,3}-{2977,3377,0,0,3}-{2941,3356,0,0,7}-{2932,3322,0,0,5}-{2934,3301,0,1,5}-{2934,3301,0,1,3}-{2973,3274,0,1,3}-{2994,3270,0,1,0}-{3010,3271,0,1,6}-{2977,3202,0,1,7}-{3068,3251,0,1,6}-{3189,3503,0,1,6}-{3182,3512,0,1,6}'),
(708, '{3215,3282,0,1,1}-{3242,3306,0,1,1}-{3208,3357,0,1,3}-{3240,3393,0,1,3}-{3219,3221,0,1,4}-{3162,3410,0,1,2}-{2962,3424,0,1,6}-{3011,3513,0,1,1}-{2980,3337,0,1,6}-{2997,3300,0,1,3}-{3031,3322,0,1,1}-{2957,3308,0,1,0}-{2935,3343,0,1,1}-{2942,3247,0,1,7}-{2976,3176,0,1,6}-{3239,3523,0,1,4}-{3262,3523,0,1,2}-{2865,3175,0,1,0}-{2855,3188,0,1,1}-{2838,3194,0,1,3}-{2806,3181,0,1,3}-{2827,3170,0,1,5}-{2788,3179,0,1,3}-{2753,3178,0,1,3}-{2759,3155,0,1,0}-{2603,3221,0,1,7}-{2604,3212,0,1,3}-{2614,3230,0,1,1}-{2611,3204,0,1,7}-{2544,3184,0,1,3}-{2627,3231,0,1,4}-{2595,3125,0,1,1}-{2598,3145,0,1,1}-{2588,3145,0,1,7}-{2601,3135,0,1,3}-{2598,3120,0,1,6}-{2615,3120,0,1,4}-{2598,3108,0,1,4}-{2733,3459,0,1,3}-{2732,3457,0,1,6}-{2715,3451,0,1,4}-{2715,3436,0,1,3}-{2977,3377,0,0,3}-{2941,3356,0,0,7}-{2932,3322,0,0,5}-{2934,3301,0,1,5}-{2934,3301,0,1,3}-{2973,3274,0,1,3}-{2994,3270,0,1,0}-{3010,3271,0,1,6}-{2977,3202,0,1,7}-{3068,3251,0,1,6}-{3189,3503,0,1,6}),
(5111, '{2569,3083,0,1,1}'),
(711, '{2536,3314,1,0,0}'),
(5110, '{2566,3084,0,1,6}'),
@ -20412,7 +20412,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(4702, '{3084,9957,0,1,6}-{2712,9480,0,0,5}'),
(4703, '{3092,9958,0,1,2}'),
(851, '{2449,3503,1,1,4}'),
(4707, '{3213,3253,0,0,6}-{3146,3480,0,0,6}'),
(4707, '{3213,3253,0,0,6}'),
(4706, '{3242,5555,0,1,3}-{3206,5493,0,1,5}'),
(850, '{2439,3502,1,0,4}'),
(4705, '{3088,9961,0,1,1}-{3169,5528,0,1,0}'),
@ -21093,7 +21093,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(1862, '{3304,3211,0,1,1}'),
(1863, '{3358,2956,0,0,6}'),
(1860, '{2957,3203,0,1,3}'),
(1861, '{3208,3256,0,0,1}-{3145,3479,0,0,4}'),
(1861, '{3208,3256,0,0,1}'),
(5644, '{3795,2845,0,0,3}'),
(5647, '{3803,2872,2,0,0}'),
(5646, '{3792,2830,0,0,0}'),
@ -21231,6 +21231,11 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(2235, '{3241,3345,0,1,4}'),
(2236, '{3078,3250,0,1,1}-{3081,3250,0,1,2}'),
(2237, '{3249,3266,0,1,5}'),
(6523, '{3173,3498,0,0,1}'),
(6524, '{3156,3481,0,0,1}'),
(6525, '{3175,3481,0,0,1}'),
(6526, '{3152,3490,0,0,1}'),
(6527, '{3154,3498,0,0,1}'),
(6528, '{3164,3491,0,0,1}'),
(6529, '{3165,3488,0,0,6}'),
(6535, '{3163,3489,0,0,3}'),
@ -21327,8 +21332,8 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(6502, '{2775,4247,0,1,0}'),
(6499, '{2793,4247,0,1,0}'),
(6498, '{2796,4256,0,1,0}'),
(6521, '{3161,3478,0,0,6}'),
(6522, '{3168,3478,0,0,6}'),
(6521, '{3161,3475,0,0,6}'),
(6522, '{3168,3475,0,0,6}'),
(6465, '{2764,4251,0,1,0}'),
(6464, '{2796,4267,0,1,0}'),
(6486, '{2774,4236,0,0,0}'),
@ -22030,7 +22035,7 @@ INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES
(7727, '{3045,3483,0,0,0}-{3053,3492,0,0,4}-{3055,3491,0,0,0}-{3045,3496,0,0,0}-{3046,3490,1,0,0}-{3057,3497,1,0,3}'),
(7726, '{2996,3451,0,0,0}'),
(7716, '{3005,3475,0,1,7}-{3003,3473,0,1,4}-{2997,3471,0,0,0}-{3004,3494,0,0,0}-{3005,3505,0,0,0}'),
(4568, '{3157,3470,0,1,6}'),
(4568, '{33644,3338,0,1,6}'),
(8149, '{3244,9996,0,1,6}-{3229,10008,0,1,6}-{3222,10012,0,1,6}-{3205,10010,0,1,6}-{3212,10012,0,1,6}-{3205,10023,0,1,6}-{3210,10030,0,1,6}-{3212,10039,0,1,6}-{3213,10009,0,1,6}-{3243,9993,0,1,6}-{3218,10036,0,1,6}-{3218,10010,0,1,6}'),
(8150, '{3241,9997,0,1,6}-{3230,10011,0,1,6}-{3221,10012,0,1,6}-{3207,10006,0,1,6}-{3207,10017,0,1,6-{3209,10031,0,1,6}-{3209,10019,0,1,6}-{3217,10012,0,1,6}-{3224,10012,0,1,6}'),
(8151, '{3241,9998,0,1,6}-{3223,10010,0,1,6}-{3208,10012,0,1,6}-{3209,10026,0,1,6}-{3214,10038,0,1,6}-{3211,10035,0,1,6}-{3214,10037,0,1,6}-{3240,9991,0,1,6}-{3231,10010,0,1,6}-{3210,10007,0,1,6}-{3222,10010,0,1,6}'),