1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index e9e472721..e9ddb3e53 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -996,6 +996,10 @@ int npc_touch_areanpc2(struct block_list *bl)
 	xs = map_mapindex2mapid(map[m].npc[i]->u.warp.mapindex);
 	if (xs < 0) // Can't warp object between map servers...
 		return 0;
+
+	if(battle_config.mob_npc_warp<2 && map[xs].flag.nobranch)
+		return 0; //Disable warps to nobranch maps.
+	
 	unit_warp(bl, xs, map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,0);
 	return 1;
 }