Edited .gitignore properly; fixed armor invulnarability in the server code.

diff --git a/.gitignore b/.gitignore
index 78b047f32197fd9bbf6aef550d0a6f6cdc95662b..bfb815bbfe3fc43861b7a274db5cd5f15056acd1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,8 @@ build/.cmake/
 /worlds
 /world/
 /client/mod_storage/
+/clientmods/*
+!/clientmods/mods_here.txt
 
 ## Configuration/log files
 minetest.conf

diff --git a/clientmods/mods_here.txt b/clientmods/mods_here.txt
new file mode 100644 (file)
index 0000000..ea2175f
--- /dev/null
+++ b/clientmods/mods_here.txt
@@ -0,0 +1,4 @@
+You can install Minetest or Dragonfire clientmods by copying (and extracting) them into this folder.
+To enable them write
+  load_mod_<modname> = true
+in mods.conf in this directory.

diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp
index 67efed21045ece45aa35f4ad433be7ccf66d673c..3d9f08bfa3deadd6fa5e281a63d99373efabcc1b 100644 (file)
--- a/src/server/player_sao.cpp
+++ b/src/server/player_sao.cpp
@@ -459,7 +459,7 @@ void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason)
 {
        s32 oldhp = m_hp;
 
-       hp = rangelim(hp, 0, m_prop.hp_max);
+       //hp = rangelim(hp, 0, m_prop.hp_max);
 
        if (oldhp != hp) {
                s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp, reason);