summaryrefslogtreecommitdiff
path: root/src/game-server/mapcomposite.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/mapcomposite.cpp')
-rw-r--r--src/game-server/mapcomposite.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp
index b9e4b863..e7267d08 100644
--- a/src/game-server/mapcomposite.cpp
+++ b/src/game-server/mapcomposite.cpp
@@ -532,6 +532,12 @@ void MapComposite::setMap(Map *m)
assert(!mMap && m);
mMap = m;
mContent = new MapContent(m);
+
+ std::string sPvP = m->getProperty ("pvp");
+ if (sPvP == "free") mPvPRules = PVP_FREE;
+ else if (sPvP == "none") mPvPRules = PVP_NONE;
+ else mPvPRules = PVP_NONE;
+
}
void MapComposite::update()