diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-23 15:01:33 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-23 15:01:33 -0400 |
| commit | b19a8149a4400180427cf9acbd1498151ccb22c7 (patch) | |
| tree | a9f0fd8002354efecbdf84da821e30b994b61ce5 /src/map/pc.cpp | |
| parent | 8489de74ecca371c3e99c0dcff14c9ad96ee749b (diff) | |
| parent | 0bced72906ec8d78f656bf6d1462fa8cd85b9da2 (diff) | |
| download | tmwa-b19a8149a4400180427cf9acbd1498151ccb22c7.tar.gz tmwa-b19a8149a4400180427cf9acbd1498151ccb22c7.tar.bz2 tmwa-b19a8149a4400180427cf9acbd1498151ccb22c7.tar.xz tmwa-b19a8149a4400180427cf9acbd1498151ccb22c7.zip | |
Merge pull request #211 from wushin/pvp-resave-bug
Make PvP use Resave
Diffstat (limited to 'src/map/pc.cpp')
| -rw-r--r-- | src/map/pc.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/map/pc.cpp b/src/map/pc.cpp index d2cc12c..d65297b 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -3339,16 +3339,11 @@ int pc_damage(dumb_ptr<block_list> src, dumb_ptr<map_session_data> sd, sd->pvp_point -= 5; if (src && src->bl_type == BL::PC) src->is_player()->pvp_point++; - pc_setdead(sd); } // 強制送還 if (sd->pvp_point < 0) { sd->pvp_point = 0; - pc_setstand(sd); - pc_setrestartvalue(sd, 3); - pc_setpos(sd, sd->status.save_point.map_, sd->status.save_point.x, - sd->status.save_point.y, BeingRemoveWhy::GONE); } } |