Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Fix merge conlfict

Browse source
This commit is contained in:
dginovker 2020-03-28 23:27:57 -04:00
commit 9a6c2d6c86
4 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Server/server.sql
View file

@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/
--
-- Host: 127.0.0.1
-- Generation Time: Mar 29, 2020 at 12:18 AM
-- Generation Time: Mar 29, 2020 at 12:21 AM
-- Server version: 10.4.11-MariaDB
-- PHP Version: 7.4.2
@ -882,7 +882,7 @@ INSERT INTO `ground_spawns` (`item_id`, `loc_data`) VALUES
(983, '{1,3131,9862,0,7209050}'),
(995, '{3,3195,9834,0,11141270}-{4,3195,9820,0,11141270}-{66,3191,9821,0,11141270}-{56,3190,9819,0,11141270}-{26,3188,9819,0,11141270}-{26,3188,9820,0,11141270}-{35,3189,9819,0,11141270}-{384,3224,3830,0,6553650}-{384,3220,3824,0,6553650}-{2,3106,3547,0,13107300}-{1,3104,3558,0,13107300}-{1,3106,3534,0,13107300}-{2,3101,3564,0,13107300}-{4,3103,3579,0,13107300}-{2,3234,3560,0,13107300}'),
(1005, '{1,3014,3227,0,3276830}-{1,3009,3204,0,3276830}'),
(1059, '{1,3242,3385,1,7209050}-{1,3097,3486,0,7864410}'),
(1059, '{1,3242,3385,1,7209050}-{1,3097,3486,0,7864410}-{1,3148,3177,0,5898270}'),
(1061, '{1,3244,3386,1,13762750}-{1,3208,9620,0,13762750}-{1,3210,9615,0,13762750}-{1,3111,3159,0,13762750}-{1,3112,3155,0,7864420}-{1,3302,3190,0,5898270}'),
(1119, '{1,3084,3859,0,6553660}'),
(1137, '{1,3242,3688,0,13107350}'),