flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Add beam target, configurable base visibility to Ender Crystals (#5010)

Browse Source 
* Fixes #4990

Co-authored-by: 12xx12 <12xx12100@gmail.com>
This commit is contained in:
12xx12
2020-10-29 21:47:20 +01:00
committed by GitHub
parent 6d85435f60
commit 961d5eb420
14 changed files with 200 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/WorldStorage/WSSAnvil.cpp
View File

@@ -1718,11 +1718,42 @@ void cWSSAnvil::LoadBoatFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
void cWSSAnvil::LoadEnderCrystalFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
{
auto EnderCrystal = std::make_unique<cEnderCrystal>(Vector3d());
auto EnderCrystal = std::make_unique<cEnderCrystal>(Vector3d(), false);
if (!LoadEntityBaseFromNBT(*EnderCrystal.get(), a_NBT, a_TagIdx))
{
return;
}
int CurrentLine = a_NBT.FindChildByName(a_TagIdx, "BeamTarget");
if (CurrentLine > 0)
{
EnderCrystal->SetDisplayBeam(true);
if (a_NBT.GetType(CurrentLine) == TAG_Compound)
{
Vector3d BeamTarget = {0, 0, 0};
int CoordinateLine = a_NBT.FindChildByName(CurrentLine, "X");
if (CoordinateLine > 0)
{
BeamTarget.x = a_NBT.GetInt(CoordinateLine);
}
CoordinateLine = a_NBT.FindChildByName(CurrentLine, "Y");
if (CoordinateLine > 0)
{
BeamTarget.y = a_NBT.GetInt(CoordinateLine);
}
CoordinateLine = a_NBT.FindChildByName(CurrentLine, "Z");
if (CoordinateLine > 0)
{
BeamTarget.z = a_NBT.GetInt(CoordinateLine);
}
}
}
CurrentLine = a_NBT.FindChildByName(a_TagIdx, "ShowBottom");
if (CurrentLine > 0)
{
EnderCrystal->SetShowBottom(a_NBT.GetByte(CurrentLine) == 1);
}
a_Entities.emplace_back(std::move(EnderCrystal));
}