diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/018-1/_warps.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/018-1/_warps.txt')
| -rw-r--r-- | world/map/npc/018-1/_warps.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt index 67e45f36..7996cc23 100644 --- a/world/map/npc/018-1/_warps.txt +++ b/world/map/npc/018-1/_warps.txt @@ -14,7 +14,7 @@ 018-1.gat,158,34|warp|To Northern Mine|-1,-1,018-3.gat,64,103 018-1.gat,162,44|warp|To Northern Mine|-1,-1,018-3.gat,29,166 018-1.gat,177,20|warp|To Jack O Cave|-1,-1,013-3.gat,177,90 -018-1.gat,65,73|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28 +018-1.gat,65,73|warp|To Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28 018-1.gat,79,98|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,18 -018-1.gat,64,70|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21 +018-1.gat,64,70|warp|To Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21 018-1.gat,78,34|warp|To Northern Mine|-1,-1,018-3.gat,107,147 |