Edited .gitignore properly; fixed armor invulnarability in the server code.
parent
bbcd249544
commit
847198edb6
|
@ -53,6 +53,8 @@ build/.cmake/
|
||||||
/worlds
|
/worlds
|
||||||
/world/
|
/world/
|
||||||
/client/mod_storage/
|
/client/mod_storage/
|
||||||
|
/clientmods/*
|
||||||
|
!/clientmods/mods_here.txt
|
||||||
|
|
||||||
## Configuration/log files
|
## Configuration/log files
|
||||||
minetest.conf
|
minetest.conf
|
||||||
|
|
|
@ -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.
|
|
@ -459,7 +459,7 @@ void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason)
|
||||||
{
|
{
|
||||||
s32 oldhp = m_hp;
|
s32 oldhp = m_hp;
|
||||||
|
|
||||||
hp = rangelim(hp, 0, m_prop.hp_max);
|
//hp = rangelim(hp, 0, m_prop.hp_max);
|
||||||
|
|
||||||
if (oldhp != hp) {
|
if (oldhp != hp) {
|
||||||
s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp, reason);
|
s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp, reason);
|
||||||
|
|
Loading…
Reference in New Issue