From 62ad2c3bc1dd3a1a70d9eefbe2fac8fcbe426a1b Mon Sep 17 00:00:00 2001
From: pecksin <78765996+pecksin@users.noreply.github.com>
Date: Wed, 16 Feb 2022 17:06:00 -0500
Subject: Use absolute value for bouncy in collision (#11969)

[backport: removed devtest change and protocol_version comparison]
---
 src/collision.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/collision.cpp')

diff --git a/src/collision.cpp b/src/collision.cpp
index d85a56884..ccc3a058d 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -303,7 +303,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 			if (!f.walkable)
 				continue;
 
-			int n_bouncy_value = itemgroup_get(f.groups, "bouncy");
+			// Negative bouncy may have a meaning, but we need +value here.
+			int n_bouncy_value = abs(itemgroup_get(f.groups, "bouncy"));
 
 			int neighbors = 0;
 			if (f.drawtype == NDT_NODEBOX &&
-- 
cgit v1.2.3