mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Use absolute value for bouncy in collision (#11969)
* use abs(bouncy) in collision * test case for negative bouncy * send abs(bouncy) to old clients
This commit is contained in:
parent
258ae99491
commit
5d0b18a0d0
@ -252,9 +252,9 @@ for i=-100, 100, 25 do
|
||||
end
|
||||
|
||||
-- Bouncy nodes (various bounce levels)
|
||||
for i=20, 180, 20 do
|
||||
for i=-140, 180, 20 do
|
||||
local val = math.floor(((i-20)/200)*255)
|
||||
minetest.register_node("testnodes:bouncy"..i, {
|
||||
minetest.register_node(("testnodes:bouncy"..i):gsub("-","NEG"), {
|
||||
description = S("Bouncy Node (@1%)", i),
|
||||
groups = {bouncy=i, dig_immediate=3},
|
||||
|
||||
|
@ -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 &&
|
||||
|
@ -452,7 +452,12 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
|
||||
writeU16(os, groups.size());
|
||||
for (const auto &group : groups) {
|
||||
os << serializeString16(group.first);
|
||||
writeS16(os, group.second);
|
||||
if (protocol_version < 41 && group.first.compare("bouncy") == 0) {
|
||||
// Old clients may choke on negative bouncy value
|
||||
writeS16(os, abs(group.second));
|
||||
} else {
|
||||
writeS16(os, group.second);
|
||||
}
|
||||
}
|
||||
writeU8(os, param_type);
|
||||
writeU8(os, param_type_2);
|
||||
|
Loading…
Reference in New Issue
Block a user