diff options
| author | Wushin <pasekei@gmail.com> | 2015-05-23 15:48:49 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-05-23 15:48:49 -0500 |
| commit | 5cedb51071e056993658ffd5974bd2ea7496e7fe (patch) | |
| tree | aaed7013b6a4900fae003fa149dcfe4fcfad9769 | |
| parent | 097019378130079baf43fed4513db891c30b9bea (diff) | |
| parent | 2541c18584d6cbb57a4a3959cc90465b43421943 (diff) | |
| download | serverdata-5cedb51071e056993658ffd5974bd2ea7496e7fe.tar.gz serverdata-5cedb51071e056993658ffd5974bd2ea7496e7fe.tar.bz2 serverdata-5cedb51071e056993658ffd5974bd2ea7496e7fe.tar.xz serverdata-5cedb51071e056993658ffd5974bd2ea7496e7fe.zip | |
Merge pull request #388 from wushin/fix-crashingv2015.5.23
Fix OnTouch, callfunc, trigger, end starting area bug
| -rw-r--r-- | world/map/npc/029-2/sorfina.txt | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt index 181a2589..f083396c 100644 --- a/world/map/npc/029-2/sorfina.txt +++ b/world/map/npc/029-2/sorfina.txt @@ -255,9 +255,6 @@ OnTouch: 029-2,33,27,0|script|#Carpet|32767,1,1 { - end; - -OnTouch: if (QL_BEGIN != 1) end; mes "[Sorfina]"; @@ -309,9 +306,6 @@ L_CloseDis: 029-2,44,31,0|script|#DoorOutTut1|45,0,0 { - end; - -OnTouch: if (QL_BEGIN < 4) goto L_Block; warp "029-2", 112, 85; @@ -323,9 +317,6 @@ L_Block: } 029-2,23,24,0|script|#GameRules1|32767,0,1 { - end; - -OnTouch: if (TUT_var > 0) end; mes "[Server/Client Notice]"; @@ -336,9 +327,6 @@ OnTouch: } 029-2,21,24,0|script|#GameRules2|32767,0,1 { - end; - -OnTouch: if (TUT_var > 0) end; callfunc "GameRules"; |