From c47d0269509a9984a4594408872a886fba21e250 Mon Sep 17 00:00:00 2001
From: Foz <fozolo@gmail.com>
Date: Mon, 2 May 2016 22:36:29 -0400
Subject: [PATCH] cherry-pick from github.com/minetest/minetest_game> Tnt: Fix
 bug in dropped item counting

---
 mods/default/README.txt                         |  10 +++++-----
 .../default/textures/default_dry_grass_side.png | Bin 285 -> 890 bytes
 mods/default/textures/default_grass_side.png    | Bin 771 -> 779 bytes
 mods/default/textures/default_snow_side.png     | Bin 360 -> 376 bytes
 mods/tnt/init.lua                               |   2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 15a7f5af..8e72ca5e 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -87,7 +87,6 @@ InfinityProject (WTFPL):
 
 Splizard (CC BY-SA 3.0):
   default_snow.png
-  default_snow_side.png
   default_pine_sapling.png
 
 Zeg9 (CC BY-SA 3.0):
@@ -98,7 +97,7 @@ Zeg9 (CC BY-SA 3.0):
   default_gold_block.png
 
 paramat (CC BY-SA 3.0):
-  wieldhand.png copied from character.png by Jordach (CC BY-SA 3.0)
+  wieldhand.png -- Copied from character.png by Jordach (CC BY-SA 3.0)
   default_pinetree.png
   default_pinetree_top.png
   default_pinewood.png
@@ -121,6 +120,7 @@ paramat (CC BY-SA 3.0):
   default_dry_grass_*.png
   default_grass.png
   default_grass_side.png
+  default_snow_side.png
 
 brunob.santos (CC BY-SA 4.0):
   default_desert_cobble.png
@@ -182,6 +182,9 @@ Gambit (WTFPL):
 asl97 (WTFPL):
   default_ice.png
 
+KevDoy (CC BY-SA 3.0)
+  heart.png
+
 Glass breaking sounds (CC BY 3.0):
   1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
   2: http://www.freesound.org/people/Tomlija/sounds/97669/
@@ -221,6 +224,3 @@ Mito551 (sounds) (CC BY-SA):
   default_dirt_footstep.1.ogg
   default_dirt_footstep.2.ogg
   default_glass_footstep.ogg
-
-KevDoy (CC BY-SA 3.0)
-  heart.png
diff --git a/mods/default/textures/default_dry_grass_side.png b/mods/default/textures/default_dry_grass_side.png
index 27f4d9604f672ba30fb4eda036057c889c0b2072..ef375b7fc388c6a1a6d2ed45ca6de773680094e5 100644
GIT binary patch
delta 852
zcmbQs^ownRq!b$i1B3kM|A`C?3~Wi>?k)`fL2$v|<&!6N%GEz$krPr^|G(Qkj)8%h
z-P6S}#NxE?WZN9+Qi)^r-yi<I|NZB=^yjxuwQgA_z~!u}BBHo3#la&r!9k()6`Qd4
z(LNq)>0rr-fYz2H2OLz7T<B=s$gQhl;x%W7-R`nEzYFGA-!^ofvf}&~uk#-~_CK#(
zGJjuWJXh$0c2k+_%nLTx@9vhrcA<2x-*V>wUIC{75!TH&dp7B8)almo4X{1F{ASLk
z&42Z~mTZX7<9N-x$t2NgW|Fkp;l+$?8$Q(ZZ?bT`Y?5<btxM@j+UAp&>*p11F6C~}
z@r}?Cmw9?TqpK}<hRelJnd^)1zZJUT%#d^W*@FiRPw$#8jV)c}ap2y+;+*>1j0*zu
z6<Qpw^QJxRxp-Rf>Z<<dRZAkh-n;VO-a0XQwXWOCj=25piaO7p&N1MS>_29)&OK0M
z%2CZ}sS}@D9$u{Yx#--M84EnPik4qqxb@bfH#z4{O%?sK;n?K;^Am2Hi5JE6SBNk#
zcx_b|ad>OYCKJbPyp#9tjZKM6{d@25w}<t0?C#|^>NooDzwLT8#OJu$D%U$Z|F5u>
z>#h8EpHKVxy28I(uTSj%l>DylYq<3aHin34uCAdOYqxo*YtEkk|B@WPdrD>z-}!AD
zc_(jw|L;QIV+qp@s~P(5|9^Dd_rV^ug`4Z%C;mRZ{(k2ESFu~ZJe<BiKkkmuhL6X~
z<#SUrog(V<Kio^V&;QW%@6W%>x|cUvo-C@l|9q{#T+W|wZ`q?Kttoi^Z!z!7kInrv
z{g(YOoxgaxvr6Q_4LrvV3)V$2J4_Vuc`ozHb6T(nYvingzsGn(j(?ruw=Be@QSHm=
zl)DC!JZvmi8PvZ>d`a5m$>y+AW9Qzo*&i!<tX>>7neF>&vP``q3xjANV?yONhpSgk
z^XJ5LTAVBrJIz`sV?6t8fc8|bLYZK(<!7F8cSSlbzIdR}man>fMxSq>$d~HcO_zIC
zh$*%t6xcjSdo5NpO>M=juE$jo(^^+>Oe#Ed?wj$wn&jS;IS<-RO?;iFru^C9Ht+e3
zHqZUHUHM-3o|a6{JhWwoK7)X3I3q_>L#5?%9q$&c8#n8YeadN6ncw_ZzV)}$nrT<N
QK>3Hk)78&qol`;+0CYy6ssI20

delta 269
zcmeyxHkWCFWIZzj1A~Sxe=q|BgHwP{h$}+?!-^)0HLV^i+g&$yI&bTBTi@@!bCU0_
zDL&h$`tF(HcW|ozk?8>kW(6IY?Q?vd|Ct3rmzM|LTod|uL->QO5wCVe9pdy5XJBAp
zED7=pW^j0RBMrn!@^*J&=wOxgU|?Y2EbxddW?<kJW?<m17iMIbHAjMhfq}im)7O>#
zK06~PmucJD6`TwV3?ZH_jv*44ueNpzHW+XmowrTo0@s(v|5iucJ@iDcanskhJ*wQo
zw&f?TtXO#HWXw)pp0{^xML%ll=D9uM`Ti_Xviz<##{sjxP9FuQI41Fj5!Ijn%G-!!
YF=y`Dv+^+m0|SGnE1RFoI;Vst04-K#y8r+H

diff --git a/mods/default/textures/default_grass_side.png b/mods/default/textures/default_grass_side.png
index 1a853b2ee1f64bc6283beb9ba025e2555d56ac41..bfd538df6e89a653a261b9071753ab2d74125ed1 100644
GIT binary patch
delta 708
zcmZo>>t>q}TrVf2Bx8I$%ASFNX@;kZV~E9R-^sT5F|HzQ^No$m)4s=jJ8Z^fn84_D
za6N<jLWf7~0RfKgtkKJw)q-3Ou3zBEc<NM8ovX@Zi@*s7`}V%R``gsG{m~=Q;9isW
z)g|XD?@c_v&+bzB`(8o8e|7to-YFMJ_O2H8+?&L`@UF@n^N@OWR`KPg*Q8JFRNmGl
zeOAZ(f60+BPGN3`c=cVm$08h!J5HR7>0#$}2v_&n>?fgpL`|7(SMIVn*IA)QSPzCz
zJ1OhG-P3xrKJV+#ef#_@8n&;ON^56KZWR$;8G33jQ^PN<MXN-VnHxT{y>8pRUT57L
zYp2xCwL-I58a6iR^Ins#?>U>JuRP1xQd5uP8h`$*gIi{|=(YqzrpdD$Ix=bUroBCD
z?rk}I=$q`SF8SMcE1up_Wb;{}bJj|5_nCZqyZ8=CD~1!Ek^ip-u2)*P>CeB*^SK2N
zTHJ_pefGZJfZ?>ezW6o?pR=V-G6@Mq$BRFmzImwfa7Eagu5GiAoP50b=&wEXho3HC
z@SksEv$wwcSopNb$J4v@_x-M5wE6q^x%l_|i&Kk_uQfZ`!*G0leesq#vTS;O+4KJX
z`ZeSKT=x5QTYBzJ=nROQXJcdg@6&JpX=klA)_nOCvG3PIxorZoLYLfCacQ}ut;rXy
ze{9;tBbQ>-PyJP_-FVt$^@%U*j$aKg<OrHxUp_~9rU?7FSr32tp8m4e!LRvdL}JzT
z|I77xZ=dd1-}YzsN`X~PrRy`~()gyTe)Wo1_fg!Dpz*!y;rg0i4;Y@et~=+v+MM&O
zfZDVhsX@zsY&=-$ywiTdi`hPXr@rO(-?f%v6wvanIDRqLc$HVq)V=)fOX6N`lN2=Y
zI}zwPcT$z@(TIZ)<{|RFveWgmih_!QjvV;4M_GNTmBxnF1n$J*i;GuT<j;_0`^S2_
XCM>u04p%Az0|SGntDnm{r-UW|uAWeS

delta 700
zcmeBXYi64eTrVTQCAqy;=05`i(*#c!#}JFtzLU@A$+!x%?|=2~<;=OA*Z(VdERkrm
z_#otxt>{`QRP?atNa4elBf3Hyg%6HsH?&x&_^I&OI3JiHpvqPDsA8|Rwe8(lnOkOG
zw(j<d-Tz*DXKlX!`u+BfE<c{1>?%7R=&N(MQl+<RZA;?Jf_wEB-iFPQ`4*9%v0bJx
zAZBx>r9Iyf$Cc(f49W93R`+adN)wp4`cYQUJ%$#$#B1Fx8=Yd(k2pl6{@Q%vm(HWC
zgXPnDx7#GnT-Q~b9kGX}r}hxTo`2Q8n=^ktU2XqdGwsrXEw@D({$@V;V=-ZJ(TA_`
z#m{-K&AhZ?^Nh07A8+%Ye_mf0z+lp}u_>ST>XA<m{#~@;^@>Pkh|!J6|MB&Adhyu@
zZK+HZKOX$MXy>pu@uk1AeSM|H{|}F&iyu6E{C?iM_;YvXyUNuT@8DNpW0`T*uJZYU
zES`Ov|9m<6-uPd6-u>Iw0_>&fAJ;xUet!O$cQwD>9juyI@#pR3nRouav8_qxJYC=N
zwe4tkgT)1&x6_n+z5GsXeLe57eON@kK(JeB@4=@_bo||VL|vv_P_Ie<|2T&GpHl5>
zuK!s<$7I@DxL5bA+Elsu*^>>+XIkZ`hR+G*t?iJ|-eS#{+`7^K$OJ*bnC;Pt+M0J}
zH>Jm<UQ3@ihihiq;Z1du7iiBr67X)hxy?HJdfmIpI}SYIo#@lmx;d@lb4|jpGG9M0
zo}(9D^45RcXSycNwI=*edGNw_T4IaiSR>1)nPeHR7mCTv*uHv`wtUT&?$1syihsVU
zbSnO+*yh94HD6+m`4;P==L+YZ42;|>xAAs0Z-B-1>oU_99&^08@9KnONeek7)Ss+a
zvS3M|VVHsGwW;sUUitWHh5GVCu{=6)(`0w>+zLDNDa9qU@ZN^X&ClW$6GMLR%~^Gd
Qfq{X+)78&qol`;+047jj3;+NC

diff --git a/mods/default/textures/default_snow_side.png b/mods/default/textures/default_snow_side.png
index 3e98915131310783a3632d7622c61bdc0ca107b2..f13ec94041f30abf1c8953778008a790957ad3b8 100644
GIT binary patch
delta 350
zcmaFC^n+=Fay<iElDE4H!+#K5uy^@n1_lPs0*}aI1_o|n5N2eUHAjMhfq}im)7O>#
z0V@jwn`(p4ts@K!jI5q6jv*GOYlCn0wixi#y8W3Pz<5~1sASvaTOx-79S?<k_@-=R
z5f|Y-vF6D2&AOH9&g^gE85n}tjx9W)xp<M?wOw{h^}SpRt*1^qws4R2PS#g%YFVbe
z<w>cWs=IZcPxQp?D|563CSBojDo>MW-+$AF&7E7!MLKrwn!Ast7+rXC|MHHU*6%ZI
zZ-&j9(kSs{uF;2@6Std8`HpVOIjY%qx$Z-yI^&)%Pv_1F7dpTnd7EL+nm(1=5-GF7
z>q;t<CcJcrNKyJ3zEQVx%KuZR_k3bFcmB_Q-;jM@qsvXLc+=)iowfSytK_#C$6tR9
zWi`8S_1ewk%eN<1KFyuKPqjWnlX<Pxi}a`O3qI_Me`>klK~MEUBL)Tr22WQ%mvv4F
FO#lQro~Hl+

delta 334
zcmeyt^nz)Eay_HIr;B4q1!MA#>i_@i7223Me*a|`VB45jbEn9IZ9$ep$6~3vhqt0t
z1XnN`)Cg+q{C2|2qW=BCv;WQIZhzXJn|J<yt9AJQ_whHs)&IJ(@Bi}kF)h)D7?Rf9
z*zmRfmdo}3KZ76rTW`DP<^OZS+5hW*eERnP+Sk+n^`ka_sxOQ`QU8C{$;|)S*-iiQ
zqj&%K|Abfg-~4?gf=Lbz^RCsar5!6_V{1G0#BXu^#8RvOSJxiB_MyA@O5>3lBh&xU
zJ5K*E?+E&RUjNiYb`kF{tBroi-%R~>|3Y{kV{`bPPxZ0d7uPy;nn{-KQ<1g4DCFkG
zCaVxH+hN&o!+7VV5Bq&5Y}(u9zHx>8g#6PCEb9!l{!2<qRy)2inXuB~49k(8fLXkp
us~I;kuqZQ3(LdzC(;(fz+|v}uz%V0@$?57$=LiM{1_n=8KbLh*2~7ZQ|E8$`

diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua
index 49fd7010..1e5d5a50 100644
--- a/mods/tnt/init.lua
+++ b/mods/tnt/init.lua
@@ -45,7 +45,7 @@ local function eject_drops(drops, pos, radius)
 		local count = item:get_count()
 		while count > 0 do
 			local take = math.max(1,math.min(radius * radius,
-					item:get_count(),
+					count,
 					item:get_stack_max()))
 			rand_pos(pos, drop_pos, radius)
 			local dropitem = ItemStack(item)
-- 
GitLab