Wuzzy
/
BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add connection_timeout setting, put block animation, correct lava damage

master
MoNTE48 2019-06-04 00:11:33 +02:00
parent 1b63b277d0
commit 1c00b33fef
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/default/files/default/nodes.lua
View File

@ -1196,7 +1196,7 @@ minetest.register_node("default:lava_source", {
liquid_alternative_source = "default:lava_source",
liquid_viscosity = 7,
liquid_renewable = false,
damage_per_second = 4 * 2,
damage_per_second = 4,
post_effect_color = {a = 191, r = 255, g = 64, b = 0},
groups = {lava = 3, liquid = 2, igniter = 1, not_in_creative_inventory = 1},
on_construct = function(pos)
@ -1249,7 +1249,7 @@ minetest.register_node("default:lava_flowing", {
liquid_alternative_source = "default:lava_source",
liquid_viscosity = 7,
liquid_renewable = false,
damage_per_second = 4 * 2,
damage_per_second = 4,
post_effect_color = {a = 191, r = 255, g = 64, b = 0},
groups = {lava = 3, liquid = 2, igniter = 1,
not_in_creative_inventory = 1},

4
games/default/files/player_api/api.lua
View File

@ -122,11 +122,15 @@ minetest.register_globalstep(function(dtime)
end
if controls.LMB then
player_set_animation(player, "walk_mine", animation_speed_mod)
elseif controls.RMB then
player_set_animation(player, "walk_mine", animation_speed_mod)
else
player_set_animation(player, "walk", animation_speed_mod)
end
elseif controls.LMB then
player_set_animation(player, "mine")
elseif controls.RMB then
player_set_animation(player, "mine")
else
player_set_animation(player, "stand", animation_speed_mod)
end

7
src/defaultsettings.cpp
View File

@ -55,7 +55,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("client_unload_unused_data_timeout", "600");
settings->setDefault("client_mapblock_limit", "5000");
settings->setDefault("enable_build_where_you_stand", "false" );
settings->setDefault("send_pre_v25_init", "true");
settings->setDefault("send_pre_v25_init", "false");
settings->setDefault("curl_timeout", "5000");
settings->setDefault("curl_parallel_limit", "8");
settings->setDefault("curl_file_download_timeout", "300000");
@ -63,9 +63,10 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_remote_media_server", "true");
settings->setDefault("enable_client_modding", "false");
settings->setDefault("max_out_chat_queue_size", "20");
settings->setDefault("connection_timeout", "20");
// Keymap
settings->setDefault("remote_port", "30000");
settings->setDefault("remote_port", "40000");
settings->setDefault("keymap_forward", "KEY_KEY_W");
settings->setDefault("keymap_autorun", "");
settings->setDefault("keymap_backward", "KEY_KEY_S");
@ -272,7 +273,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("ipv6_server", "false");
settings->setDefault("workaround_window_size", "5");
settings->setDefault("max_packets_per_iteration", "1024");
settings->setDefault("port", "30000");
settings->setDefault("port", "40000");
settings->setDefault("strict_protocol_version_checking", "false");
settings->setDefault("player_transfer_distance", "0");
settings->setDefault("max_simultaneous_block_sends_per_client", "10");

2
src/game.cpp
View File

@ -2195,7 +2195,7 @@ bool Game::connectToServer(const std::string &playername,
wait_time += dtime;
// Only time out if we aren't waiting for the server we started
if ((*address != "") && (wait_time > 15)) {
if ((*address != "") && (wait_time > g_settings->getS32("connection_timeout"))) {
bool sent_old_init = g_settings->getFlag("send_pre_v25_init");
// If no pre v25 init was sent, and no answer was received,
// but the low level connection could be established