From a0caf808e00f8f7dc26250b4243e6e8610e2d065 Mon Sep 17 00:00:00 2001 From: aa6 Date: Tue, 14 Jul 2020 09:58:04 +0300 Subject: [PATCH] Fix: Getting rid of duplicate minetest.register_on_joinplayer. --- VERSION | 2 +- init.core.lua | 45 +-------------------------------- init.lua | 45 ++++++++++++++++++++++++++++++++- init.set_sprinting_physics.lua | 12 +++++---- util/version.png | Bin 2087 -> 2005 bytes 5 files changed, 53 insertions(+), 51 deletions(-) diff --git a/VERSION b/VERSION index 4dd35ad..daa5795 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.13 \ No newline at end of file +0.10.14 \ No newline at end of file diff --git a/init.core.lua b/init.core.lua index 97dfc95..49d46fd 100644 --- a/init.core.lua +++ b/init.core.lua @@ -210,47 +210,4 @@ function minetest_wadsprint.load_players_stats() minetest_wadsprint.offline_stats[val.name] = { stamina = val.stamina } end end -end ----------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------- Mod initialization -- ----------------------------------------------------------------------------------------------------- -minetest.register_on_joinplayer(minetest_wadsprint.initialize_player) -minetest.register_on_respawnplayer(minetest_wadsprint.reset_player_stats) -minetest.register_on_leaveplayer(minetest_wadsprint.deinitialize_player) - --- Register hudbar call for compatibility with some hudbar mods. -if minetest_wadsprint.register_hudbar ~= nil then - minetest_wadsprint.register_hudbar() -end - --- Save player stats to file on server shutdown. -if minetest_wadsprint.SAVE_PLAYERS_STATS_TO_FILE then - minetest_wadsprint.load_players_stats() - minetest.register_on_shutdown(minetest_wadsprint.save_players_stats) -end - --- Main cycle. -local timer_of_stats_update = 0 -local timer_of_controls_check = 0 -minetest.register_globalstep(function(seconds_since_last_global_step) -- Called every server step, usually interval of 0.05s. - - timer_of_stats_update = timer_of_stats_update + seconds_since_last_global_step - timer_of_controls_check = timer_of_controls_check + seconds_since_last_global_step - - -- Run stamina update cycle for every player. - if timer_of_stats_update > minetest_wadsprint.PLAYER_STATS_UPDATE_PERIOD_SECONDS then - timer_of_stats_update = 0 - for player_name,player in pairs(minetest_wadsprint.stats) do - minetest_wadsprint.stamina_update_cycle_tick(player) - end - end - - -- Scan players controls. - if timer_of_controls_check > minetest_wadsprint.PLAYER_CONTROLS_CHECK_PERIOD_SECONDS then - timer_of_controls_check = 0 - for player_name,player in pairs(minetest_wadsprint.stats) do - minetest_wadsprint.scan_player_controls(player) - end - end - -end) \ No newline at end of file +end \ No newline at end of file diff --git a/init.lua b/init.lua index 709e6e2..5f54a54 100755 --- a/init.lua +++ b/init.lua @@ -33,4 +33,47 @@ dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.core.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.legacy.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.config.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.hudbars.lua") -dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.set_sprinting_physics.lua") \ No newline at end of file +dofile(minetest.get_modpath(minetest.get_current_modname()).."/init.set_sprinting_physics.lua") +---------------------------------------------------------------------------------------------------- +------------------------------------------------------------------------------ Mod initialization -- +---------------------------------------------------------------------------------------------------- +minetest.register_on_joinplayer(minetest_wadsprint.initialize_player) +minetest.register_on_respawnplayer(minetest_wadsprint.reset_player_stats) +minetest.register_on_leaveplayer(minetest_wadsprint.deinitialize_player) + +-- Register hudbar call for compatibility with some hudbar mods. +if minetest_wadsprint.register_hudbar ~= nil then + minetest_wadsprint.register_hudbar() +end + +-- Save player stats to file on server shutdown. +if minetest_wadsprint.SAVE_PLAYERS_STATS_TO_FILE then + minetest_wadsprint.load_players_stats() + minetest.register_on_shutdown(minetest_wadsprint.save_players_stats) +end + +-- Main cycle. +local timer_of_stats_update = 0 +local timer_of_controls_check = 0 +minetest.register_globalstep(function(seconds_since_last_global_step) -- Called every server step, usually interval of 0.05s. + + timer_of_stats_update = timer_of_stats_update + seconds_since_last_global_step + timer_of_controls_check = timer_of_controls_check + seconds_since_last_global_step + + -- Run stamina update cycle for every player. + if timer_of_stats_update > minetest_wadsprint.PLAYER_STATS_UPDATE_PERIOD_SECONDS then + timer_of_stats_update = 0 + for player_name,player in pairs(minetest_wadsprint.stats) do + minetest_wadsprint.stamina_update_cycle_tick(player) + end + end + + -- Scan players controls. + if timer_of_controls_check > minetest_wadsprint.PLAYER_CONTROLS_CHECK_PERIOD_SECONDS then + timer_of_controls_check = 0 + for player_name,player in pairs(minetest_wadsprint.stats) do + minetest_wadsprint.scan_player_controls(player) + end + end + +end) \ No newline at end of file diff --git a/init.set_sprinting_physics.lua b/init.set_sprinting_physics.lua index d2d11c4..a9b299e 100644 --- a/init.set_sprinting_physics.lua +++ b/init.set_sprinting_physics.lua @@ -21,11 +21,13 @@ if minetest_wadsprint.BAD_PHYSICS_OVERRIDE_MODE == true then end elseif minetest.get_modpath("player_monoids") ~= nil then - minetest.register_on_joinplayer(function(player_obj) - minetest_wadsprint.stats[player_obj:get_player_name()].monoids = {} - minetest_wadsprint.stats[player_obj:get_player_name()].monoids.jump = {} - minetest_wadsprint.stats[player_obj:get_player_name()].monoids.speed = {} - end) + local default_minetest_wadsprint_initialize_player = minetest_wadsprint.initialize_player + function minetest_wadsprint.initialize_player(player_obj) + default_minetest_wadsprint_initialize_player(player_obj) + minetest_wadsprint.stats[player_obj:get_player_name()].monoids = {} + minetest_wadsprint.stats[player_obj:get_player_name()].monoids.jump = {} + minetest_wadsprint.stats[player_obj:get_player_name()].monoids.speed = {} + end function minetest_wadsprint.set_sprinting_physics(player,is_on_val) if player.is_sprinting_physics_on ~= is_on_val then if is_on_val == true then diff --git a/util/version.png b/util/version.png index eaa0027604aac6edb0b12ab00f1054c33a944174..4cbcd3033ff1e419dab36f048e501d6c04c26e0d 100644 GIT binary patch delta 1826 zcmV+-2i^Fm5Y-Qmjej}>HMc&+000KBNklik}|6#byJ(MBTow4 zDP?Z+<9|vdpIuT=x%5ziWcfxK_Lg*NZQFCWhD&cpN?oQ(CAqC@tIkSse~?Vq zrHn{pjfWvShDd>S>G3LQ%Lb|7D`{na>4zt!ZnvcZT2HDglI_RRsVM2$krG)_)=GDY zqn|WupJe)(^x9+6ezTN+MVc{LvcyZT4v^}S?qNi|bbm8l`tlnoGF0k%NGd7!u6MpC zrCyLM^Ce5Hl<`Iz45@!tit8--O_#R+vl($tTC!ULY5r_U4aUK2rBYg$G`gqMc}|nw zyjjX>@x=>MrN~24pBJT)6L;U&*rgYqmi)F!IZu0ETN#(HQ7k3d4$<5j`QU14LxOzP|8%2jlW{PKDEZpez?6 zOc0p{8e>rNGvV4`7`+W1X?A9WS|Q;BxHA^^*}b0wb>G3s8n}5Hy7vbEm7tfs>q}3; z`;S8O4EV)#(0uP&H$yHAh00~ndoXmk>@Ms&8h?6x3}q=$aoRYTe>i+v1m7mX{{4`6 z17!8oovCPg4mjk=_4zXd^@gH}VEe6co?b7(-b^@{413PO;~#=6*;s3WHrFd2R~69(77%y=+W0G|LIyoYlOV}IWX_<<$eK=}ojp90q!aIS5mAqLP1aIOJ! zDwxlD@}^Z_ngEWYpby%gr*<7IS_`(du($}q{#~YYrfC}lw!x5qY~U|oEA$k)ioxa! z)_Cw~Z2v?pUx05m*l&Q{=E>WOz)=XkOTfIook?!O`e^ui5zL8#0dZg-3XV zz|j$0HgHaMAL>>z5qUs0RL$|s(Kr{XZ$aQF2zjObhWPY^uxFrQCe#HOtmRKoKNh-G zgYOWa{{C~^UI01CV4n;*^Wfl1phtn{;Y>Kt4?f)pySu~4C}@6Mx)~Dl83g6QB`Y*0 zf=|X>?p9AI9S30<5IMa4hM3kt_kZQ!nhnLj_T#RpvP(`2#2yI?!wc9pd=Z7S_Bbqw%-tdCpUx7 zML6&p*tfWIe?JF~i4eOP%yZip-~T2oKM#lVA%7_x?hl6t!O;}>~Lo1}Smi6ACro!I~3bUjSor!KbQ8@7N0&!BA2U@m3h{T-zo* zurCbqft(1)-3+70HN7v`2-zc`M77jJ>VMJ}cb5~=yfSH2 zCuwiIXPop6((}8eeZ`)fBTw2sK^hh$J^ZZHu~HhCE3G{z-C5zTy?94T=q-(RN@cs; zx%#crtgBMui_$eOcdX{vv_pE~p!B!rjCqq}{0q^R3+0t?`!fi=08wdRnb1OX30!?a zPB6a>rlsz*s}a-{%uZ=wN;KZywMU>L8(iN*L@a~>Olu(;0nQL08Y~UKnr2)+IC}xB zz~TT>S}!LTpe|s3A4~@AzE?y3U-94dSCFf=PL zGdeIZ7TO2ilhFqvG&MLnFf=PLGdeIZXNSLH0000DbVXQnY++($YydDWF)%JMG`6kA Q*8l(j07*qoM6N<$f+QGXvj6}9 delta 1894 zcmV-s2buWQ52p~2jeidytA!Y%000L8Nkl(Zoh^`ARj#R}(R2rKF}&8<+8&`T`SZ;}atw zf&rsod?F8_FwA534{XOfGbpmUR{MwhueoRMbN2bp{buI7*MB5Q+{1t1_rGr7{|)yB z;sKunX?z;?2EogN;Az2}O2}OcI&pW!OABCT92DjG=F3xIb6_j z{I>22?|vbLRewrZFM4w)Go?XerGQbA<MYqO>JpG(PoB>OHS zcj{wla5u@nMhdHzIxLgg_(_)D(yS+>x>)aeUOQyxaafcN54;Z_TVQ`QEK7yzIWWr# zg-7miyEa3^R`|yXNRI)>KH%3zNo^v$wHdM_U`i+0(|-s%4nfk}@X2Xd{t~#h+}_4D z4X%~L8XFv20{%sS+0EPHVc~JetcT}bhg}(PpaC+R(D^j{VF`Q|euo`WTO}o@OXf^z z+XQ#qby#|9n*`GQkD9+*wL_(ORZ?Pt)S-KmKICgD>zGmZ`BBLnE+xfFRq5{dnR2N| zy7c`rsed@7d7qpLX5heM(N5M#{BhLCBOTn@%fTH z>NY#1I1i4NKn>p~;fD-bNR z;7S_UdK`|Z>#O?(8L*XdkVc!FJYA`%G5&SdZ_##Mp7<9v^i7AIok?_!9 z?|=MD`=Rblh};Hk&fR7pW%=NI8KOdg<3?df7DRT2l3b`LfUZ6oHN`?`EHDx@4ubXr z6M$#kn!2yx@uR;Cq;YLRzXBbGYJ`jBoaueV}rBQft3V)QZf=5%} z{`Xox5K~|H$#7`=400YZa<**9$$*eAA#PvmJpgQNA?rG1AM)mIl)%}g5WWno9w%?Z zK%$}`xe`jJL&g(e|Eei|tsd4UgQ*9Mo(%r4-ZbqF>6;<-8l0X?i;=Jix}Aaz)8It4 zJN~yq*lU5uOwi|+hp&_UV1Mp;_;4=RTR5lz*P-1C$e0Pa%RyyL@%r8HQ3M=52Js`I zm&GH|^H^LGBK31fp(bhkYtlTcl<=e!Fh+VYTdG^?)>d_vVoI8h&Yuo4)^YWfChU*` zi=<4ahshLaRj_1sNk5t-&7Lkz?;%CzN}ZmUKCd>)Gd47N^nXaIy?Eq!J`M}q|kx~vyQJ1BNz0wbM zO0(?Jm0*u&m-W)r_0rIxQqB;Mfn-bXL`%u_(#Z|p9`z~Gnq5-dAgNuBWG$2uHc2}U zNG_{UyKjP&m?Hf)K!0kOWaPd{lYX{EnzvYT+%R(0eWbLxQhb4A{iS3{lDhs%8aG+` z`w~eJEgXm>H6%(U7Afy}sXR_{`k1B;N{)QV5h=N{JPSz9G|BO(By%$+!=$Twq=Go9 zuuiJ^v2U4cx#TcQPLrfl9^^pDF