summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-02-26 15:10:32 -0300
committershennetsind <ind@henn.et>2014-02-26 15:10:32 -0300
commit4bd9c3040926f35b14e3eab523620c9d20fe4d6b (patch)
treee64fa416e48477e9d464a5a19ce1c376e0b80737 /src
parent0732f55931524c1a2cf703805d61e955c4afea29 (diff)
parent3f473c2800f8637a6f6ce245b93ac51475e69989 (diff)
downloadhercules-4bd9c3040926f35b14e3eab523620c9d20fe4d6b.tar.gz
hercules-4bd9c3040926f35b14e3eab523620c9d20fe4d6b.tar.bz2
hercules-4bd9c3040926f35b14e3eab523620c9d20fe4d6b.tar.xz
hercules-4bd9c3040926f35b14e3eab523620c9d20fe4d6b.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/unit.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 45b8505e5..36adbae9c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10291,7 +10291,7 @@ void clif_parse_ActionRequest(int fd, struct map_session_data *sd)
void clif_parse_Restart(int fd, struct map_session_data *sd) {
switch(RFIFOB(fd,2)) {
case 0x00:
- pc->respawn(sd,CLR_RESPAWN);
+ pc->respawn(sd,CLR_OUTSIGHT);
break;
case 0x01:
/* Rovert's Prevent logout option - Fixed [Valaris] */
diff --git a/src/map/unit.c b/src/map/unit.c
index 96d2c7775..47cf07ef6 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2288,9 +2288,10 @@ int unit_remove_map(struct block_list *bl, clr_type clrtype, const char* file, i
void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype)
{
unit->remove_map(&sd->bl,clrtype,ALC_MARK);
-
- if (clrtype == CLR_TELEPORT) clrtype = CLR_OUTSIGHT; //CLR_TELEPORT is the warp from logging out, but pets/homunc need to just 'vanish' instead of showing the warping out animation.
-
+
+ //CLR_RESPAWN is the warp from logging out, CLR_TELEPORT is the warp from teleporting, but pets/homunc need to just 'vanish' instead of showing the warping animation.
+ if (clrtype == CLR_RESPAWN || clrtype == CLR_TELEPORT) clrtype = CLR_OUTSIGHT;
+
if(sd->pd)
unit->remove_map(&sd->pd->bl, clrtype, ALC_MARK);
if(homun_alive(sd->hd))