From b57e3d1ad7576767e127d692f9763cf52fea3305 Mon Sep 17 00:00:00 2001 From: Thomas Arp Date: Sat, 7 Apr 2018 17:13:27 +0200 Subject: [PATCH] Make sure vict is valid_dg_target in do_mteleport (#48) Also, trigger world enter trigger for the newly moved target, not the caller. --- src/dg_mobcmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dg_mobcmd.c b/src/dg_mobcmd.c index 7c6f5ca..8a20dc7 100644 --- a/src/dg_mobcmd.c +++ b/src/dg_mobcmd.c @@ -618,7 +618,7 @@ ACMD(do_mteleport) if (valid_dg_target(vict, DG_ALLOW_GODS)) { char_from_room(vict); char_to_room(vict, target); - enter_wtrigger(&world[IN_ROOM(ch)], ch, -1); + enter_wtrigger(&world[IN_ROOM(vict)], vict, -1); } } } else { @@ -632,10 +632,10 @@ ACMD(do_mteleport) return; } - if (valid_dg_target(ch, DG_ALLOW_GODS)) { + if (valid_dg_target(vict, DG_ALLOW_GODS)) { char_from_room(vict); char_to_room(vict, target); - enter_wtrigger(&world[IN_ROOM(ch)], ch, -1); + enter_wtrigger(&world[IN_ROOM(vict)], vict, -1); } } }