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

Suggestions

Browse Source
This commit is contained in:
Tiger Wang 2014-07-02 21:07:34 +01:00
parent 284c1c0514
commit 89a26cc786
4 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Entities/ArrowEntity.cpp
View File

@ -68,14 +68,14 @@ bool cArrowEntity::CanPickup(const cPlayer & a_Player) const
void cArrowEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) void cArrowEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
{ {
if (GetSpeed().SqrLength() == 0)
{
SetSpeed(GetLookVector().NormalizeCopy() * 0.1); // Ensure that no division by zero happens later
}
Vector3d Hit = a_HitPos; Vector3d Hit = a_HitPos;
Vector3d SinkMovement = GetSpeed() / 800; // Base value for arrow penetration Vector3d SinkMovement = (GetSpeed() / 800);
SinkMovement = Clamp( // Adjust the movement so that fast arrows don't go through blocks (though in reality they would, in addition to exploding into fragments :P) Hit += (SinkMovement * 0.01) / SinkMovement.Length(); // Make arrow sink into block a centimetre so it lodges (but not to far so it goes black clientside)
SinkMovement,
(SinkMovement * 0.001) / SinkMovement.Length(),
(SinkMovement * 0.05) / SinkMovement.Length()
);
Hit += SinkMovement; // Make arrow sink into block a little
super::OnHitSolidBlock(Hit, a_HitFace); super::OnHitSolidBlock(Hit, a_HitFace);
Vector3i BlockHit = Hit.Floor(); Vector3i BlockHit = Hit.Floor();

6
src/Entities/ArrowEntity.h
View File

@ -59,8 +59,14 @@ public:
/// Sets the IsCritical flag /// Sets the IsCritical flag
void SetIsCritical(bool a_IsCritical) { m_IsCritical = a_IsCritical; } void SetIsCritical(bool a_IsCritical) { m_IsCritical = a_IsCritical; }
/** Gets the block arrow is in */
Vector3i GetBlockHit(void) const { return m_HitBlockPos; }
// tolua_end // tolua_end
/** Sets the block arrow is in */
void SetBlockHit(const Vector3i & a_BlockHit) { m_HitBlockPos = a_BlockHit; }
protected: protected:
/// Determines when the arrow can be picked up by players /// Determines when the arrow can be picked up by players

17
src/WorldStorage/NBTChunkSerializer.cpp
View File

@ -589,20 +589,19 @@ void cNBTChunkSerializer::AddProjectileEntity(cProjectileEntity * a_Projectile)
m_Writer.BeginCompound(""); m_Writer.BeginCompound("");
AddBasicEntity(a_Projectile, a_Projectile->GetMCAClassName()); AddBasicEntity(a_Projectile, a_Projectile->GetMCAClassName());
Vector3d Pos = a_Projectile->GetPosition(); Vector3d Pos = a_Projectile->GetPosition();
m_Writer.AddShort("xTile", (Int16)floor(Pos.x)); m_Writer.AddByte("inGround", a_Projectile->IsInGround() ? 1 : 0);
m_Writer.AddShort("yTile", (Int16)floor(Pos.y));
m_Writer.AddShort("zTile", (Int16)floor(Pos.z));
m_Writer.AddShort("inTile", 0); // TODO: Query the block type
m_Writer.AddShort("shake", 0); // TODO: Any shake?
m_Writer.AddByte ("inGround", a_Projectile->IsInGround() ? 1 : 0);
switch (a_Projectile->GetProjectileKind()) switch (a_Projectile->GetProjectileKind())
{ {
case cProjectileEntity::pkArrow: case cProjectileEntity::pkArrow:
{ {
m_Writer.AddByte("inData", 0); // TODO: Query the block meta (is it needed?) cArrowEntity * Arrow = (cArrowEntity *)a_Projectile;
m_Writer.AddByte("pickup", ((cArrowEntity *)a_Projectile)->GetPickupState());
m_Writer.AddDouble("damage", ((cArrowEntity *)a_Projectile)->GetDamageCoeff()); m_Writer.AddInt("xTile", (Int16)Arrow->GetBlockHit().x);
m_Writer.AddInt("yTile", (Int16)Arrow->GetBlockHit().y);
m_Writer.AddInt("zTile", (Int16)Arrow->GetBlockHit().z);
m_Writer.AddByte("pickup", Arrow->GetPickupState());
m_Writer.AddDouble("damage", Arrow->GetDamageCoeff());
break; break;
} }
case cProjectileEntity::pkGhastFireball: case cProjectileEntity::pkGhastFireball:

11
src/WorldStorage/WSSAnvil.cpp
View File

@ -1656,6 +1656,15 @@ void cWSSAnvil::LoadArrowFromNBT(cEntityList & a_Entities, const cParsedNBT & a_
Arrow->SetDamageCoeff(a_NBT.GetDouble(DamageIdx)); Arrow->SetDamageCoeff(a_NBT.GetDouble(DamageIdx));
} }
// Load block hit:
int InBlockXIdx = a_NBT.FindChildByName(a_TagIdx, "xTile");
int InBlockYIdx = a_NBT.FindChildByName(a_TagIdx, "yTile");
int InBlockZIdx = a_NBT.FindChildByName(a_TagIdx, "zTile");
if ((InBlockXIdx > 0) && (InBlockYIdx > 0) && (InBlockZIdx > 0))
{
Arrow->SetBlockHit(Vector3i(a_NBT.GetInt(InBlockXIdx), a_NBT.GetInt(InBlockYIdx), a_NBT.GetInt(InBlockZIdx)));
}
// Store the new arrow in the entities list: // Store the new arrow in the entities list:
a_Entities.push_back(Arrow.release()); a_Entities.push_back(Arrow.release());
} }
@ -2481,8 +2490,6 @@ bool cWSSAnvil::LoadProjectileBaseFromNBT(cProjectileEntity & a_Entity, const cP
} }
a_Entity.SetIsInGround(IsInGround); a_Entity.SetIsInGround(IsInGround);
// TODO: Load inTile, TileCoords
return true; return true;
} }