diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-10-18 12:06:11 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-10-18 12:06:11 +0200 |
| commit | 847198edb6fb906165bf0b2b9518d0e6a0677722 (patch) | |
| tree | 6f0348ce23e865ead2815650dc8e135e20c45778 | |
| parent | bbcd2495444225fd16f61f8a830185ed5b8cf77f (diff) | |
| download | dragonfireclient-847198edb6fb906165bf0b2b9518d0e6a0677722.tar.xz | |
Edited .gitignore properly; fixed armor invulnarability in the server code.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | clientmods/mods_here.txt | 4 | ||||
| -rw-r--r-- | src/server/player_sao.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 78b047f32..bfb815bbf 100644 --- 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 index 000000000..ea2175f2d --- /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 67efed210..3d9f08bfa 100644 --- 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); |