diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-08 17:55:37 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-08 17:55:37 +0000 |
| commit | 0d24db22f0c4aeef985588da3b852078045cdda2 (patch) | |
| tree | 7fe7c1ddd32f2ab21ddfd690a2de9f97dca4b0fc /src/map/atcommand.c | |
| parent | 67560f093d726077d558479cee4e46af2c26d91d (diff) | |
| download | hercules-0d24db22f0c4aeef985588da3b852078045cdda2.tar.gz hercules-0d24db22f0c4aeef985588da3b852078045cdda2.tar.bz2 hercules-0d24db22f0c4aeef985588da3b852078045cdda2.tar.xz hercules-0d24db22f0c4aeef985588da3b852078045cdda2.zip | |
- Casting Kaensin will clear out Suiton and viceversa now.
- Fixed drop-rates (@whodrops) getting duplicates when you use @reloadmobdb
- Fixed unjailing not sending characters to Prontera.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8188 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 76e5cd9db..1da8be43b 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6523,9 +6523,7 @@ int atcommand_unjail( return -1;
}
- m_index = mapindex_name2id(MAP_JAIL);
-
- if (pl_sd->mapindex != m_index) {
+ if (pl_sd->mapindex != mapindex_name2id(MAP_JAIL)) {
clif_displaymessage(fd, msg_table[119]); // This player is not in jails.
return -1;
}
@@ -6536,7 +6534,8 @@ int atcommand_unjail( x = pl_sd->sc.data[SC_JAILED].val4&0xFFFF;
y = pl_sd->sc.data[SC_JAILED].val4>>16;
status_change_end(&pl_sd->bl,SC_JAILED,-1);
- }
+ } else
+ m_index = mapindex_name2id(MAP_PRONTERA);
if (pc_setpos(pl_sd, m_index, x, y, 3) == 0 ||
pc_setpos(pl_sd, mapindex_name2id(MAP_PRONTERA), 0, 0, 3) == 0
|