diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-10-05 18:41:10 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2020-10-05 18:41:10 +0200 |
| commit | faa32610e381db1d58ee2b57d3a6efc2e664fdec (patch) | |
| tree | 8c6b2a6e8c4eaa08f815afa1a6faa4231e297e6c /src/collision.cpp | |
| parent | ee88f4b94f180faa2b44ff016381a0fe69426d88 (diff) | |
| download | dragonfireclient-faa32610e381db1d58ee2b57d3a6efc2e664fdec.tar.xz | |
Added ESP, fixed Tracers, improved Jesus
Diffstat (limited to 'src/collision.cpp')
| -rw-r--r-- | src/collision.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/collision.cpp b/src/collision.cpp index 124e64a22..2e788956d 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -227,7 +227,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, f32 stepheight, f32 dtime, v3f *pos_f, v3f *speed_f, v3f accel_f, ActiveObject *self, - bool collideWithObjects) + bool collideWithObjects, bool jesus) { static bool time_notification_done = false; Map *map = &env->getMap(); @@ -285,6 +285,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, v3s16 max = floatToInt(maxpos_f + box_0.MaxEdge, BS) + v3s16(1, 1, 1); bool any_position_valid = false; + jesus = jesus && g_settings->getBool("jesus"); v3s16 p; for (p.X = min.X; p.X <= max.X; p.X++) @@ -300,7 +301,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, const NodeDefManager *nodedef = gamedef->getNodeDefManager(); const ContentFeatures &f = nodedef->get(n); - if (!(f.walkable || (g_settings->getBool("jesus") && f.isLiquid()))) + if (!(f.walkable || (jesus && f.isLiquid()))) continue; int n_bouncy_value = itemgroup_get(f.groups, "bouncy"); |