summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNiLSPACE <NiLSPACE@users.noreply.github.com>2017-03-22 15:08:42 +0100
committerGitHub <noreply@github.com>2017-03-22 15:08:42 +0100
commit96663d35b20b6d0cafdb132c920eceeff779fe5a (patch)
tree2a101a64786cb32ec8ba798180971f993ba70233 /src
parentFireworks can be fired from a dispenser (diff)
parentNBT: Corrected firework loading (diff)
downloadcuberite-96663d35b20b6d0cafdb132c920eceeff779fe5a.tar
cuberite-96663d35b20b6d0cafdb132c920eceeff779fe5a.tar.gz
cuberite-96663d35b20b6d0cafdb132c920eceeff779fe5a.tar.bz2
cuberite-96663d35b20b6d0cafdb132c920eceeff779fe5a.tar.lz
cuberite-96663d35b20b6d0cafdb132c920eceeff779fe5a.tar.xz
cuberite-96663d35b20b6d0cafdb132c920eceeff779fe5a.tar.zst
cuberite-96663d35b20b6d0cafdb132c920eceeff779fe5a.zip
Diffstat (limited to 'src')
-rwxr-xr-xsrc/WorldStorage/WSSAnvil.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 2bf11d3f4..54ee5b1da 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -814,8 +814,8 @@ bool cWSSAnvil::LoadItemFromNBT(cItem & a_Item, const cParsedNBT & a_NBT, int a_
}
// Load firework data:
- int FireworksTag = a_NBT.FindChildByName(TagTag, ((a_Item.m_ItemType == E_ITEM_FIREWORK_STAR) ? "Fireworks" : "Explosion"));
- if (EnchTag > 0)
+ int FireworksTag = a_NBT.FindChildByName(TagTag, ((a_Item.m_ItemType == E_ITEM_FIREWORK_STAR) ? "Explosion" : "Fireworks"));
+ if (FireworksTag > 0)
{
cFireworkItem::ParseFromNBT(a_Item.m_FireworkItem, a_NBT, FireworksTag, static_cast<ENUM_ITEM_ID>(a_Item.m_ItemType));
}