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

Fully implemented leashes (#3798)

Browse Source
This commit is contained in:
Pablo Beltrán
2017-08-21 10:46:41 +02:00
committed by Mattes D
parent f81e6f6b6d
commit b18f6637b6
42 changed files with 1022 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/WorldStorage/WSSAnvil.cpp
View File

@@ -50,10 +50,12 @@
#include "../Entities/ExpOrb.h"
#include "../Entities/HangingEntity.h"
#include "../Entities/ItemFrame.h"
#include "../Entities/LeashKnot.h"
#include "../Entities/Painting.h"
#include "../Protocol/MojangAPI.h"
#include "Server.h"
#include "BoundingBox.h"
@@ -1540,6 +1542,8 @@ void cWSSAnvil::LoadEntityFromNBT(cEntityList & a_Entities, const cParsedNBT & a
{ "minecraft:xp_orb", &cWSSAnvil::LoadExpOrbFromNBT },
{ "ItemFrame", &cWSSAnvil::LoadItemFrameFromNBT },
{ "minecraft:item_frame", &cWSSAnvil::LoadItemFrameFromNBT },
{ "LeashKnot", &cWSSAnvil::LoadLeashKnotFromNBT },
{ "minecraft:leash_knot", &cWSSAnvil::LoadLeashKnotFromNBT },
{ "Arrow", &cWSSAnvil::LoadArrowFromNBT },
{ "minecraft:arrow", &cWSSAnvil::LoadArrowFromNBT },
{ "SplashPotion", &cWSSAnvil::LoadSplashPotionFromNBT },
@@ -1958,6 +1962,24 @@ void cWSSAnvil::LoadItemFrameFromNBT(cEntityList & a_Entities, const cParsedNBT
void cWSSAnvil::LoadLeashKnotFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
{
auto LeashKnot = cpp14::make_unique<cLeashKnot>(BLOCK_FACE_NONE, 0.0, 0.0, 0.0);
if (!LoadEntityBaseFromNBT(*LeashKnot.get(), a_NBT, a_TagIdx))
{
return;
}
LoadHangingFromNBT(*LeashKnot.get(), a_NBT, a_TagIdx);
a_Entities.emplace_back(std::move(LeashKnot));
}
void cWSSAnvil::LoadPaintingFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
{
// Load painting name:
@@ -3182,6 +3204,13 @@ bool cWSSAnvil::LoadMonsterBaseFromNBT(cMonster & a_Monster, const cParsedNBT &
a_Monster.SetCustomNameAlwaysVisible(CustomNameVisible);
}
// Leashed to a knot
int LeashedIdx = a_NBT.FindChildByName(a_TagIdx, "Leashed");
if ((LeashedIdx >= 0) && a_NBT.GetByte(LeashedIdx))
{
LoadLeashToPosition(a_Monster, a_NBT, a_TagIdx);
}
return true;
}
@@ -3189,6 +3218,54 @@ bool cWSSAnvil::LoadMonsterBaseFromNBT(cMonster & a_Monster, const cParsedNBT &
void cWSSAnvil::LoadLeashToPosition(cMonster & a_Monster, const cParsedNBT & a_NBT, int a_TagIdx)
{
int LeashIdx = a_NBT.FindChildByName(a_TagIdx, "Leash");
if (LeashIdx < 0)
{
return;
}
double PosX = 0.0, PosY = 0.0, PosZ = 0.0;
bool KnotPosPresent = true;
int LeashDataLine = a_NBT.FindChildByName(LeashIdx, "X");
if (LeashDataLine >= 0)
{
PosX = a_NBT.GetDouble(LeashDataLine);
}
else
{
KnotPosPresent = false;
}
LeashDataLine = a_NBT.FindChildByName(LeashIdx, "Y");
if (LeashDataLine >= 0)
{
PosY = a_NBT.GetDouble(LeashDataLine);
}
else
{
KnotPosPresent = false;
}
LeashDataLine = a_NBT.FindChildByName(LeashIdx, "Z");
if (LeashDataLine >= 0)
{
PosZ = a_NBT.GetDouble(LeashDataLine);
}
else
{
KnotPosPresent = false;
}
if (KnotPosPresent)
{
// Set leash pos for the mob
a_Monster.SetLeashToPos(new Vector3d(PosX, PosY, PosZ));
}
}
bool cWSSAnvil::LoadProjectileBaseFromNBT(cProjectileEntity & a_Entity, const cParsedNBT & a_NBT, int a_TagIdx)
{
if (!LoadEntityBaseFromNBT(a_Entity, a_NBT, a_TagIdx))