From 2d0b2e7ea757acc79bfee801775698615b0c2bb8 Mon Sep 17 00:00:00 2001
From: Maksim <MoNTE48@mail.ua>
Date: Thu, 26 May 2022 19:30:24 +0300
Subject: [PATCH] Minor changes and fixes

---
 .gitattributes                           |   1 +
 .github/workflows/lua_lint.yml           |  11 ++++++-----
 builtin/game/knockback.lua               |   5 ++---
 multicraft.conf.example                  |   2 +-
 src/client/renderingengine.cpp           |  13 +++++++------
 src/client/tile.cpp                      |   7 -------
 textures/base/pack/creative_bg.png       | Bin 704 -> 818 bytes
 textures/base/pack/creative_bg_ru.png    | Bin 790 -> 944 bytes
 textures/base/pack/creative_checkbox.png | Bin 172 -> 171 bytes
 9 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 2e62a4e59..b0121f508 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
+* text=auto
 *.cpp diff=cpp
 *.h diff=cpp
diff --git a/.github/workflows/lua_lint.yml b/.github/workflows/lua_lint.yml
index 738e5afff..82374193a 100644
--- a/.github/workflows/lua_lint.yml
+++ b/.github/workflows/lua_lint.yml
@@ -14,12 +14,13 @@ on:
 jobs:
   luacheck:
     name: "Builtin Luacheck and Unit Tests"
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-    - name: Install luarocks
-      run: |
-        sudo apt-get install luarocks -qyy
+    - uses: actions/checkout@v3
+    - uses: leafo/gh-actions-lua@v9
+      with:
+        luaVersion: "5.1.5"
+    - uses: leafo/gh-actions-luarocks@v4
 
     - name: Install luarocks tools
       run: |
diff --git a/builtin/game/knockback.lua b/builtin/game/knockback.lua
index a95c43a47..fdf8008df 100644
--- a/builtin/game/knockback.lua
+++ b/builtin/game/knockback.lua
@@ -23,9 +23,8 @@ local function vector_absmax(v)
 end
 
 core.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, unused_dir, damage)
-	if player:get_hp() == 0
-	or player:get_animation().range ~= "stand" then
-		return -- RIP or attached
+	if player:get_hp() == 0 then
+		return -- RIP
 	end
 
 	-- Server::handleCommand_Interact() adds eye offset to one but not the other
diff --git a/multicraft.conf.example b/multicraft.conf.example
index dc9918268..62a580226 100644
--- a/multicraft.conf.example
+++ b/multicraft.conf.example
@@ -1234,7 +1234,7 @@
 # bind_address =
 
 #    Disable to prevent clients that don't support protocol version 37 from connecting.
-# enable_proto_compat = true
+# enable_protocol_compat = true
 
 #    Enable to disallow old clients from connecting.
 #    Older clients are compatible in the sense that they will not crash when connecting
diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
index f1e0558c6..d1e402fd9 100644
--- a/src/client/renderingengine.cpp
+++ b/src/client/renderingengine.cpp
@@ -558,7 +558,7 @@ void RenderingEngine::_draw_load_screen(const std::wstring &text,
 			float imgR = scale;
 #else
 			float imgRatio = (float) img_size.Height / img_size.Width;
-			u32 imgW = npot2(screensize.X / 2.0f);
+			u32 imgW = npot2(screensize.X / 2);
 			if (imgW > (screensize.X * 0.7) && imgW >= 1024)
 				imgW /= 2;
 			u32 imgH = imgW * imgRatio;
@@ -608,7 +608,7 @@ void RenderingEngine::_draw_load_screen(const std::wstring &text,
 				core::rect<s32>(507, 24, 508, 40)
 			};
 
-			for (const auto & i : rects) {
+			for (const auto &i : rects) {
 				const s32 clipx = (percent * imgW) / 100;
 				core::rect<s32> r(
 					MYMIN(i.UpperLeftCorner.X * imgR, clipx), i.UpperLeftCorner.Y * imgR,
@@ -616,12 +616,12 @@ void RenderingEngine::_draw_load_screen(const std::wstring &text,
 				);
 				if (r.getArea() <= 0)
 					break;
-				get_video_driver()->draw2DRectangle(
+				driver->draw2DRectangle(
 					video::SColor(255, 255 - percent * 2, percent * 2, 25),
 					r + img_pos, nullptr);
 			}
 
-			draw2DImageFilterScaled(get_video_driver(), progress_img,
+			draw2DImageFilterScaled(driver, progress_img,
 					core::rect<s32>(img_pos.X, img_pos.Y,
 							img_pos.X + (percent * imgW) / 100,
 							img_pos.Y + imgH),
@@ -633,7 +633,7 @@ void RenderingEngine::_draw_load_screen(const std::wstring &text,
 	}
 
 	guienv->drawAll();
-	get_video_driver()->endScene();
+	driver->endScene();
 	guitext->remove();
 }
 
@@ -825,7 +825,8 @@ v2u32 RenderingEngine::getDisplaySize()
 #else // __ANDROID__/__IOS__
 float RenderingEngine::getDisplayDensity()
 {
-	return porting::getDisplayDensity();
+	static const float density = porting::getDisplayDensity();
+	return density;
 }
 
 v2u32 RenderingEngine::getDisplaySize()
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index 97ced0b62..2e3f97056 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -1068,13 +1068,6 @@ video::IImage * Align2Npot2(video::IImage * image,
 	if (dim.Width == width)
 		return image;
 
-#ifdef __IOS__
-	if (height > 64 || width > 64) {
-		height /= 2;
-		width /= 2;
-	}
-#endif
-
 	video::IImage *targetimage =
 			driver->createImage(video::ECF_A8R8G8B8,
 					core::dimension2d<u32>(width, height));
diff --git a/textures/base/pack/creative_bg.png b/textures/base/pack/creative_bg.png
index 102ae2e947306aae9fa272ad85ebfed3afa648d6..0e5026ede7fe08915f2b40cee13d3a476fbf2227 100644
GIT binary patch
delta 795
zcmV+$1LXX`1+oT^B!3c6OjJex|Nl35$^a4|y~Dl#|Nm2EoCm+0$p8QV0d!JMQvg8b
z*k%9#0?tW9K~#7FVn6^vKznz9;zSHaaXc){Jw!c$>j~-}AOP?FR}sXIHatH14Vhx%
z{vUvufG_5^V1{Y8oeXJ1V1*S{SbdV5iYdYhE3B|WdL=Eauz$h|>q}69HC6&EtgsST
zVTJYW>tnt^b(+;t=UIV;71q62o%GxL&yUEj_aD&03hPv0h4pP9eV_#v*3*F%R#*e|
z`$v}B6WBxdv`ZpM-Ii$e_}}%b`o99!%~?$~vM8(k0@e*#{kW<hTdpcC$|@UwHda_&
zRa%r)F@)8#4S%a2Sf1Nc))+3#sy`!GVYTs!tP-qyv-*KmKeYUeK3>TRYy3IxB71tE
zd%Dd?vSQn}6&F~2-C?p=|9aNQlB`kLkNsH{F;&xv^z*D<Tw|53J4{yVoz)MlG`HPZ
z+u!>AS#?kT^uYIbp4E#BtQzA#&q_V4O;T_BvpS7WI)AJBX;v>Tuqu+TTd0TCkYlkJ
zK8{vrjp4JW2fn>-g*mGiU(f3G9$4)*xet@evW}Xirw3E4UVJI5*Lz?cmyoZ!GHXr}
z7h@(^lj2!ctDj<pwXMtQlP7Mlx^Yh2V9l`(nPP>tt;*VJtXhH<)+p9%S=*Ydt;VWF
zSYg$(Gk*nE!CHTbuxuSTaZzJce!p&+XSMo&$O`NHON5GX!diF^VB1r-!bjIoO^W9p
zwK%K(8&+6j%LP_d{}Yh9723hqlj7OO*v_goSYe%hYulKMZm_)2YkFRsv(CRnxEU*~
zxt8rDcWvexR9WFz(`}~C+I-mz`&fe&)`?%qNPo2MQ<a}UVSip2HQkHrtoeJeeExuS
zbJj%5caplMuMP~8DUG@nS6D0WZ}mfQAy!!De({~a3M;IHkHCQyRst&@-3Tjz6;?iS
ze4D@uE3AC^2w#;0>n9DYu)<1Ug_Z9m1{GFVVTCm=pq-2<!U`*_u*M{rNRYw`E3B~o
Z1{4b?XzyqzXG;J8002ovPDHLkV1lk`hF1Up

delta 680
zcmV;Z0$2UA2EYZ7B!3T3OjJex|Nk{OKE1=e|Ns9}Wt>Xxz?}d900DGTPE!Ct=GbNc
z00Li0L_t(|0qxuYirX+0gkb@`K(Ej%>;(kO{m<00squq}$YiZhIr)Ep$}0O@f2G~j
zN!^Huh=_=Yh=_=Yi0E(h>u&8t1S_ntLi+n|(83Dq&w`b1q<>#`yU{j+^#{QUE399`
z{sSwln~vI)B&pjeTAqKcA7#Ia_hN;0Q*BXJ`N8X19W{rAbvmo7N{h0}*06pWtE)<j
zvZ^j&^*)HTE*E9h_X<{6eZ3NE307GB0M^;8<wxCmaQ8q*-F76|V83o39I*O%%VskE
z^{k~OS@)5ByMI2b_Dt1u_WJXzJ~(5QpSNx%<6&+8#$TURN8`H(etplg`rv?7lDn#u
zjEA*J>h1chPUD--s{S;q4-QyW8l3mxcv$Vo{%rKRTAg)YKDvA0m)Bb<VfDdNS$(_*
z>!DiKm3mp$su|rqIKyg#&$9;OEm+Gb<mX+P)k*xzYJVqKZSWjc8-I!w*0wIIZ{{zs
z)SYw8TAR;WJI4xZTa~qCtb%n3)_t&E%i7jtZ5gXzU4&JSzNf${ShKeXbL)!pUCOG#
z>vd}yYx7{eD68t)1(W*#c6sVHu(%f0!QfN3T8vfi!wRcz%YaqsUjkCMf%c8B4+fvT
zjqR*@8-G?<Ym;7J`9L4j2ZLkQwcjFy_4WTHW5n9F_+MFVJg|=Gwv)3qKkW#6gY}B6
ziR-bI{0;=y=L7dK-3AA&!Dp~+e}nactbwavNo@<?9VnYa8g(0-uqK~xwV&8vy*?}P
z^b1&FC0Kc26RZR)tUPFxV1*S{;sN=v!b-3b5g`!~5fKp)5fKp)&FBv<EaOWrRxvC9
O0000<MNUMnLSTZ;xmtk$

diff --git a/textures/base/pack/creative_bg_ru.png b/textures/base/pack/creative_bg_ru.png
index da8f2a4d635c4eb553371c2d09ea7846ca459659..3a308d26350adde04bc93a3ef14c64e53e765164 100644
GIT binary patch
delta 922
zcmV;L17-Y{2CxT^B!3c6OjJex|Nl35$^a4|y~Dl#|Nm2EoCm+0$p8QV0d!JMQvg8b
z*k%9#158OoK~#7FVn6^vKzsLrT_+4gVR%xsj?@jLY`|p!I%W31l=MWtM}sq<haTAf
zb(aq#@ww1}48|m|!U`*_+DNuU6=8)HR#+juBrUA4!V2qdsDHr13M;Iz5?En{Rr2!v
z!@RXsfi*^jbr|-9tgyl=q#wR~z5koLFQ1`>bttgH3hPTDeMk!|tgym*uDHAFCsSDk
z_2d0gZvVi-3aht|u)=zDRyV&kt1hnQF1BDTuBpdmZHXIU9dk8U=dt<})?k4pxjh-H
zDIct}SRK{@SAT<bF01d&DhsT{nrjiz)1*<t3hQ}T4c1e$h6^mo?Neg4!?VT<S84h?
zMe$#$T0}limTI3wbz;A`d3mIDeGjmniq(V0e^V6q<{GnROa1z&Gu@h$Qa{(`xO~Ja
zJxE!H^|Y)WQx})i1=d8VHm}NRttnnXjhkH(v&KD00e@J}$?9Q~vc?O7WGP+x$s(*{
zb!E+#SJt41R@nDs)!zaASt@HS|7Be&6|hztU^OZKlvurPWG&vY7VlVnBdgceNsW7u
z?8_P*oflT&Tw+a>YCoI-Rx>SsSXN)p>U9&Vd&gS5WA%-!k}5r1omIbGB8Pxgr;AI8
z>Soqp!++~&tdcydCK_y>wRp$sN!H{#OYv*6+M<Ozn3XiEq=@QTR?`GM7S~ZdXV&5!
zt6!G2_%&H=kyRZ8XcKF-j<uGK)mF30uxg@*8LU2wRm!>ROt;vDep}s-%38ar%Vk-s
zb*y$#R_#IF@6GDttm!p@Jy?rt>Imz=A;MO56@RNl1}n+13V^U$hSemGvDRRuGg-Aw
zS&Ki)>L$r;Weu_V!C7q@Yb`x%wT{)cvFbhn>0v%=VsBnkSY(wUruSftvHCdc(5Y?5
zVQpoi?c%1ojkU^q>0t`%z|jH8=+S`@R>?70^T)D6R&!1ASXQejtd?N4JZrVttgwz=
zmwz>Io<OXs1znOoPar<ZkYcqgYc*KU&ze66OI2f5t+v-WSdtuTwfU^DPQH{_-JU~W
zg>^izatj<-VTE;mVCB}0u)+!}tgv#+aadvHIT^6>s2o^fC9uK@D}nWSJeL?$SYd?~
w)?Z&hI}lNX6;@bb)kZRqMhYveu)_Ks925BIb0E>kx&QzG07*qoM6N<$f@H$N-v9sr

delta 766
zcmV<a0s;N72bKnqB!3T3OjJex|Nk{OKE1=e|Ns9}Wt>Xxz?}d900DGTPE!Ct=GbNc
z00Om1L_t(|0qvauYU3~vMZHBA=#2!-u?NtNdI163H9+fpWiv@9vfaE_b}P$hWIk_)
zL<#Kj2><{90000000000!26IT3cM{qti(#J!@io;Ux^inm48@?^<AO6Vk@x{D<s6K
z{Zr@9LNT+t864SGAl6dXKff$iY#qHa)%z#ZwbWN`0`yk9;NZH-jD4eG>z(wbW17Hx
znTa*1tBj6nE4mVEZ}Vl<SkZOYSbb$PIw;*&+LasaG`0e<_V${wVk^4l$2xwST`s2V
zllAX)@NMd1Tz{gaz6M&Sd@bLMm0J&c=O);CswPnCx8E|f?eFpWSShWdQ@TX&=ngkA
zsZlDu^*pwU1Er3%u%T7DI#4QK*08Q7RZ4wotnfDN^UkpWc6DvE)Z?-i`-jRJ)74~$
zQj=nhz0K}A^@)dyjY}z>b}FkoocQg4r7Vog8pp;(O@H05PmZ-Wx#~^y@<^3&seD;=
zhuv*Wk;9H6t6)P}r^h-rp*PXXqw8eqsj_D1T9Q4rwC)-!l`3m|Q=1#BDxip7ZugdU
zsh0eN<0tc%Js2FznvG43H7;vvYxKxeZ$B>WdQ*Gylrw=T*z;ty;e{Qu3Aj$AGL|(P
zm-@YFtbgaxRSx=XQlqxLUSRe1SfZ{^-rEkc_V(x|-RCxeQsbvrx-M4Aj`L4!!kNGX
z{P~^Lhc$igGl5bgvc`3l`FvgZo`BDgRjc~`X96;5_ZI7IJEfQ}Iq0Ul+bW9mcFP)%
zHs`CQJVDmGWAxdv!h|z{-r}+bb(IT`%bKOD?{^X_yv_T@en{4Uu5#DovgYXO`@{-=
zHdpWK&;R&Xe|~s+;V;$%K30}7avx{{#7e9Xk5#*;&O<y_AXZ`}){mPkfUUnNRw(;_
w_N4H?WB^ToScw$?00000000000002~0>YYBZyFM(6#xJL07*qoM6N<$f~Y!zSO5S3

diff --git a/textures/base/pack/creative_checkbox.png b/textures/base/pack/creative_checkbox.png
index 910510b722d16b33fa32f94d3d68ab9c0793247d..aed949949844620f8537f5b3cd5d74d810a82d97 100644
GIT binary patch
delta 138
zcmZ3(xSDZ-W<3J~LrQwFsfFFP18p5Z4r57>UoeBivm0qZPJpM2V@L(#+cS-<41qi@
z2U{IhaW{mB|JV>3C)$48k5O4{Uq^@2*6JnKn6pkV+EV(eJ@fXf!&{z4`mMI*U;Z||
qFiP_3JLRpVOTs>fbBhQH%BL|%U%VXQ_zP$@gQu&X%Q|MKgeCy*E;X0{

delta 139
zcmV;60CfMW0jvR#DSt=+05v#1OifuG+YYDz0004WQchC<K<3zH0000{Nkl<ZcmeIq
zfdv3S3`5aCq0=1{I$fZ9-W;F20iO6GB4Em-_8zGnV_K_6l(tsAn6^j7X?4EGY3rRi
tZSR0u%?Q-qlG;MG{Yb40Xu%>PK8C3peXG=OdH?_b07*qoL<FuvV1gP^H_HG3