luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-22 12:25:23 +02:00
Code Activity

Convert spaces to tabs (#13506)

Browse Source 
* Convert spaces to tabs

* Desour reviews 1-3 fix

* Desour fixes

* Undo alignment changes
This commit is contained in:
Thresher
2023-05-26 09:13:57 -04:00
committed by GitHub
parent f4cb16cc2d
commit 00c647e4cc
19 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/player_sao.cpp
View File

@@ -185,7 +185,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
if (!isImmortal() && m_node_hurt_interval.step(dtime, 1.0f)) {
u32 damage_per_second = 0;
std::string nodename;
v3s16 node_pos;
v3s16 node_pos;
// Lowest and highest damage points are 0.1 within collisionbox
float dam_top = m_prop.collisionbox.MaxEdge.Y - 0.1f;
@@ -199,7 +199,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
if (c.damage_per_second > damage_per_second) {
damage_per_second = c.damage_per_second;
nodename = c.name;
node_pos = p;
node_pos = p;
}
}
@@ -211,7 +211,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
if (c.damage_per_second > damage_per_second) {
damage_per_second = c.damage_per_second;
nodename = c.name;
node_pos = ptop;
node_pos = ptop;
}
if (damage_per_second != 0 && m_hp > 0) {

2
src/server/player_sao.h
View File

@@ -246,7 +246,7 @@ struct PlayerHPChangeReason
ServerActiveObject *object = nullptr;
// For NODE_DAMAGE
std::string node;
v3s16 node_pos;
v3s16 node_pos;
inline bool hasLuaReference() const { return lua_reference >= 0; }