Field pathfinding (#4229)

* Update map.cpp * Update tile.cpp * Fix hasBitSet * Update tile.cpp
otland · Nov 1, 2022 · 8a0fe3f · 8a0fe3f
1 parent dd57ecb
commit 8a0fe3f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/map.cpp b/src/map.cpp
@@ -636,7 +636,16 @@ const Tile* Map::canWalkTo(const Creature& creature, const Position& pos) const
 	// used for non-cached tiles
 	Tile* tile = getTile(pos.x, pos.y, pos.z);
 	if (creature.getTile() != tile) {
-		if (!tile || tile->queryAdd(0, creature, 1, FLAG_PATHFINDING | FLAG_IGNOREFIELDDAMAGE) != RETURNVALUE_NOERROR) {
+		if (!tile) {
+			return nullptr;
+		}
+
+		uint32_t flags = FLAG_PATHFINDING;
+		if (!creature.getPlayer()) {
+			flags |= FLAG_IGNOREFIELDDAMAGE;
+		}
+
+		if (tile->queryAdd(0, creature, 1, flags) != RETURNVALUE_NOERROR) {
 			return nullptr;
 		}
 	}

diff --git a/src/tile.cpp b/src/tile.cpp
@@ -575,6 +575,11 @@ ReturnValue Tile::queryAdd(int32_t, const Thing& thing, uint32_t, uint32_t flags
 				}
 			}
 
+			MagicField* field = getFieldItem();
+			if (!hasBitSet(FLAG_IGNOREFIELDDAMAGE, flags) && field && field->getDamage() != 0) {
+				return RETURNVALUE_NOTPOSSIBLE;
+			}
+
 			if (!player->getParent() && hasFlag(TILESTATE_NOLOGOUT)) {
 				// player is trying to login to a "no logout" tile
 				return RETURNVALUE_NOTPOSSIBLE;