summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--conf-tmpl/mapflag/nopvp.txt4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e1e8ec311..efb7e148f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/19
+ * Fixed a pair of wrong mapflag lines in nopvp.txt [Skotlex]
* Removed the max cap of autoloot so you are now allowed to set autoloot
values above 100. [Skotlex]
* Initialized w1/w2/w3/w4 before reading each npc line to avoid sending
diff --git a/conf-tmpl/mapflag/nopvp.txt b/conf-tmpl/mapflag/nopvp.txt
index 36f125419..515de6ae3 100644
--- a/conf-tmpl/mapflag/nopvp.txt
+++ b/conf-tmpl/mapflag/nopvp.txt
@@ -47,13 +47,13 @@ payon_in01.gat mapflag pvp off
payon_in02.gat mapflag pvp off
payon_in03.gat mapflag pvp off
payon.gat mapflag pvp off
-pay_arche.gat mapflag pvp off
+pay_arche.gat mapflag pvp off
prt_are_in.gat mapflag pvp off
prt_are01.gat mapflag pvp off
prt_castle.gat mapflag pvp off
prt_church.gat mapflag pvp off
prt_in.gat mapflag pvp off
-prontera.gat mapflag pvp off
+prontera.gat mapflag pvp off
sec_in01.gat mapflag pvp off
sword_1-1.gat mapflag pvp off
sword_2-1.gat mapflag pvp off