From 98ccca3eb0c87841e4b4fe4bde3cdbc61002ac0b Mon Sep 17 00:00:00 2001
From: piebot <164795032+piebotc@users.noreply.github.com>
Date: Mon, 16 Mar 2026 07:18:18 +0300
Subject: [PATCH] Fix armor stands crashing the game

---
 .../Common/res/1_2_2/item/armor_stand.png      | Bin 809 -> 1538 bytes
 Minecraft.Client/Textures.cpp                  |   2 +-
 Minecraft.World/ArmorStandItem.h               |   2 +-
 Minecraft.World/EntityIO.cpp                   |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Minecraft.Client/Common/res/1_2_2/item/armor_stand.png b/Minecraft.Client/Common/res/1_2_2/item/armor_stand.png
index a5dedc87adde71f911b8a82d84fab6787f46069e..79459cc5c597a2e2557ff993e7e0806ebcb796a9 100644
GIT binary patch
delta 1531
zcmV<X1qAx327(Nb8Gi-<0063Kaozv`00d`2O+f$vv5yP<VFdsH010qNS#tmY4!-~Z
z4!;371ydvd000<tMObuGZ)S9NVRB^vaA9d~bS`dXbRaY?FfKEU=9f?a00n?aL_t(|
zUhSAciX}x5hTk0oK@dEL2XN<r?nW1)UO~{_+02N88%KIzbbr%|_QH18s32%xVh-Us
z%K56}dqn4CR=(<PyXwLF;U_aAA~WNU%&PaOjkx^b)8VJD9t?ke_u=r%qxXj}Z=v5d
z%v<c@XI*2$ydEH&<Y27;pMCW9n7D12x9Is<|F>@*HvNkM!6ZjgFrO01>cjT*i+8qh
ze?0wQ^tJp@|9{`lKOTO3{O;)g=lf5_x$YZjEQc(Bem*6}+7(D&Ken3R0_gw!+lSi%
zAf6&Xe38a-Ac<T6Zh!(5t3X=&&e_FJ0q7&%)8|&uMjFc@Ck^u>fZaCxGJAg4A5Z-8
zgW=~#?_Kjn8q0wbA{nnFNqI`No+MPDbEGjXKWh?$AAh<&wn$?+m?X*gg5p`lW&yGQ
zV--nX*8I$ctc{I#%&H1NawG$@028OLkn#n&i=UStHXi}@!0)_BV>t}NFv%>?<Y^gW
zhgoorry%q#LVgDj2P2K;P!pY*h1PCJ8DG-5BU1q^R-~~UYDs63Z0iNdsh062o!6Ql
zX)K3Y(tnvG%SqK<khEodNrkuOM;gnamh@fHt8Ni30DXLs#&W17otaVd-<FG`mQ-d&
z&3{|21|;KEh53y?{)9z;${$O;B65m?bzCp6CCWX+yhU$*6FC_t^K9PaPfuQJR|?m%
z4f7V|o?+giH@^##VWI-5He*`Gxw_d8^~X}Lh<}_Sb6uAgq<z<g<@W@9zC>&Dwb4dO
zZ4kudEYxwCNY9_grO+0c<6H#LcMWW?_B}x#Ea%f_4cd^|hJgxlaTfBonwG28^XG9X
zv_<BbG;JvW|J3({-u#f+27xf2C?eU2iehuqo<EOEp)InWNt;8aqQ=5kz9;nNhs-u=
zNq^1ZZJ~%Pz}qH`p$NoSaK%r}k8P&m0xZTNw7p+}skm5nCos>s3Sg`V*F-!v_R9sZ
zg|+#yO&bKk@ru1{*?^W!-H6r&a~!r>9Bp}1T2ut<)QZ{rp3s{gGTW#nb)U=vvN*=r
zVeNZ@Lg{D0c|8geGW#$YIdvV~gqNQ2CVwQSt|NO1*24$$9QV>UvhqE_LiX514q`zU
zuU#h-vG4D0c`aM>^Inp8A1h*Nj~(`wzg(}yE(pp3TGx?Hb3*oW9BplWY;`R$<0%57
z=Kl1?k~fFRk+6Nov<lFd1sNmf%(npau|Y&CkbaKam9xRdIpN-QB;HtCeQ;`i9)HL7
z%fssD6Kh>J{k1u{K&|<CeB%?lZ<wfj^5n^Ie0+S3*zU?6+pY(-0-T?p4;L2~Ri2)n
zj((`9Iq|XWdQd9>NuQmajkK=_#nKWxH$Jvq4{8N4VVMPHT7Wt6vF&=$DgeyMYs)-3
zI@%Th?h+r{t_NiScuo<JPc)Ae$bTs#er|khyB?GUAW0JE#7w?CNyQO6H$Jvq56S{?
zO-&dgD377Sh@BfB+uk2afjx3co@9^SfSRvHV$1zX-Z^TUOpzoxEfS{X+2s^{v*%Mi
zIXM|c&51AfE4erjWYP$b2!Pp6?A-X+X1(C8p2>6TNoTv_vkms*W1IU!?SFJKy{gia
z!%mCMHK2Z(=VlV?;{dZg&&%tWi#8ZC4mjX|8^WI!zTlMK`)HvbKD6=CgEq&Hi|jKH
zf-nW;&t2H^S0S0>W10Pf!e|lX>E_Q}`23vZr!R>3vS6|7{vdy+vj7l5h|PttwFqVW
zUKZeh0}eRgfCE+yep>%eu5=#5=Cv<}fB)Ky%zek&azBqtoBeUT2N+)b`ZCeipKaM1
z_gZ;vyayOIZ=4U8&#zkhwXwFEzihYuJ;1Pe^K#_**H?YpmVMWD<Q`yn_W2bzZ@n1l
hSX-~H^{==Y{sUez8NngGc7^}|002ovPDHLkV1kGE@zVeR

delta 797
zcmV+&1LFLG45<c?8Gi!+005o0f$RVP09{Z_R7C&)0K%POxRhU?giWuHRcBBvequM4
zbU^?XljXMn02!zN9J~M@(b1;>yp{l{h5(ax0HT6Xsfk#RkB@Y8bbo(;ot>Squ&}78
zsH3B!b6z<B6MwXjTE?Jf0000MBS_)^0004WQchC<K<3zH0Dk}idPzh<RCwC$RNIo<
zFbL%$+gT^wruBVe`Tsw&fR?T%P1kZC`jFWp0f$M15HbRQ7}pg9$jFe}AB<1}5AcR>
znA`QI*nJRDVCE1S4$27`1*#|nCfGw@TOLS;Q4$+i!U+=&duW=vs;as%Ti2C_2$GL3
z)`+kNL?XrnwSO8#V~I5adm!e(oaJq2$9K?v272^{$n#d_b!E{F?7`3Pc_Rg{t5{+v
zh3D<QM%0i{3eVept0^HuDLilYS*wxx#ovSbnveqi6%x;?3QvH$_rd*A+`kX*mxBVK
z!rQ#KM;t`yt?@Q5?h!|NrUHALAMTMx*6BiT^TR#jZ-1n>`QaY%;(41N?h!9uRi&dG
z?h!8@vR2`7@$6WxFml8wDn?Lv@j@WI%7+0W5|cm_B00wtz>62`ERXL$+J?3@=GlP4
zizg?sGCatiA|lgD#OsQr5?DMEg#cc>&)z~=RqJhu!Zo?;DlV;9bWKdm6|*V2bKw|<
zei-_`>wo*98*&b%=;z5W&U2UZ@&MzqjLSUF)7<C0{0NgQ7#BsCb0|eOP4fRqG32~F
z15H^(k{>dDsEBFPdG2#wo`G#DkhF7NUW4T~x||=lg+=aNFK-$$exwGoRbF(T^FyC<
z*A4dh<{UnQY-AX1zj3mUPp}x~QGZVtvW%i8cz;SDG07BTp#L2pM#S3Y2ZJNf&1;g$
z9}K?mtl0hn0FmuZ;C2HWncZ$LFSi$wn@*8;Ut|9<P5>gJWxCzIolYkcAIX0hpap=o
z6>T%wt$l6VR~1oaTeG&{{s?CP5z#u&$!_QKcNwblakd3%fQhlo1#Dz?yIwDst0*6r
b<QD$|)$~9ql=w`{00000NkvXXu0mjfY%_Aa

diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp
index 1f15e7d4..6ee169d5 100644
--- a/Minecraft.Client/Textures.cpp
+++ b/Minecraft.Client/Textures.cpp
@@ -170,7 +170,7 @@ const wchar_t *Textures::preLoaded[TN_COUNT] =
 	L"item/trapped",
 	L"item/trapped_double",
 
-	L"mob/armorstand/wood",
+	L"item/armor_stand",
 
 
 	//L"item/christmas",
diff --git a/Minecraft.World/ArmorStandItem.h b/Minecraft.World/ArmorStandItem.h
index ebe30ee2..ffe5312d 100644
--- a/Minecraft.World/ArmorStandItem.h
+++ b/Minecraft.World/ArmorStandItem.h
@@ -4,7 +4,7 @@
 class ArmorStandItem : public Item
 {
 public:
-    ArmorStandItem(int id) : Item(id) {}
+    ArmorStandItem(int id) : Item(id) { maxStackSize = 16; }
     virtual ~ArmorStandItem() {}
 
     virtual bool useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player,
diff --git a/Minecraft.World/EntityIO.cpp b/Minecraft.World/EntityIO.cpp
index 22083829..0395c941 100644
--- a/Minecraft.World/EntityIO.cpp
+++ b/Minecraft.World/EntityIO.cpp
@@ -111,7 +111,7 @@ void EntityIO::staticCtor()
       eMinecraftColour_Mob_Rabbit_Colour1,
       eMinecraftColour_Mob_Rabbit_Colour2, IDS_RABBIT);//change IDS_RABBIT later
 
-	setId(ArmorStand::create, eTYPE_ARMORSTAND, L"ArmorStand", 102),
+	setId(ArmorStand::create, eTYPE_ARMORSTAND, L"ArmorStand", 102);
 
 
 	setId(Villager::create, eTYPE_VILLAGER, L"Villager", 120, eMinecraftColour_Mob_Villager_Colour1, eMinecraftColour_Mob_Villager_Colour2, IDS_VILLAGER);