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

Changed fish launching mechanism (#3520)

Browse Source 
Fish and other fishing loot now correctly fly towards played when reeled in.
This commit is contained in:
Alex 2017-02-20 01:03:19 -08:00 committed by Mattes D
parent 750e2c1944
commit 9cb1ad546f
5 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -40,6 +40,7 @@ Seadragon91 (Lukas Pioch)
Sofapriester
SphinxC0re
structinf (xdot)
sweetgiorni
Sxw1212
Taugeshtu
tigerw (Tiger Wang)

9
Server/Plugins/APIDump/APIDesc.lua
View File

@ -6585,6 +6585,15 @@ cFile:DeleteFile("/usr/bin/virus.exe");
},
Notes = "Returns the EntityID of the player who owns the floater.",
},
GetBitePos =
{
Returns =
{
Name = "BitePosition",
Type = "Vector3d",
},
Notes = "Returns the position of the floater just before a fish bites. If a fish hasn't bitten the floater, this function returns the position the floater was cast from.",
},
},
Inherits = "cEntity",
},

2
src/Entities/Floater.cpp
View File

@ -103,6 +103,7 @@ protected:
cFloater::cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, UInt32 a_PlayerID, int a_CountDownTime) :
cEntity(etFloater, a_X, a_Y, a_Z, 0.2, 0.2),
m_BitePos(Vector3d(a_X, a_Y, a_Z)),
m_CanPickupItem(false),
m_PickupCountDown(0),
m_CountDownTime(a_CountDownTime),
@ -135,6 +136,7 @@ void cFloater::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
if (m_CountDownTime <= 0)
{
m_BitePos = GetPosition();
m_World->BroadcastSoundEffect("entity.bobber.splash", GetPosX(), GetPosY(), GetPosZ(), 1, 1);
SetPosY(GetPosY() - 1);
m_CanPickupItem = true;

4
src/Entities/Floater.h
View File

@ -27,12 +27,16 @@ public:
bool CanPickup(void) const { return m_CanPickupItem; }
UInt32 GetOwnerID(void) const { return m_PlayerID; }
UInt32 GetAttachedMobID(void) const { return m_AttachedMobID; }
Vector3d GetBitePos(void) const { return m_BitePos; }
// tolua_end
protected:
// Position
Vector3d m_ParticlePos;
// Position just before the floater gets pulled under by a fish
Vector3d m_BitePos;
// Bool needed to check if you can get a fish.
bool m_CanPickupItem;

10
src/Items/ItemFishingRod.h
View File

@ -35,6 +35,7 @@ public:
{
m_CanPickup = reinterpret_cast<cFloater *>(a_Entity)->CanPickup();
m_Pos = Vector3d(a_Entity->GetPosX(), a_Entity->GetPosY(), a_Entity->GetPosZ());
m_BitePos = reinterpret_cast<cFloater *>(a_Entity)->GetBitePos();
m_AttachedMobID = reinterpret_cast<cFloater *>(a_Entity)->GetAttachedMobID();
a_Entity->Destroy(true);
return true;
@ -44,11 +45,13 @@ public:
bool IsAttached(void) const { return (m_AttachedMobID != cEntity::INVALID_ID); }
UInt32 GetAttachedMobID(void) const { return m_AttachedMobID; }
Vector3d GetPos(void) const { return m_Pos; }
Vector3d GetBitePos(void) const { return m_BitePos; }
protected:
bool m_CanPickup;
UInt32 m_AttachedMobID;
Vector3d m_Pos;
Vector3d m_BitePos;
} ;
@ -236,9 +239,12 @@ public:
{
return true;
}
Vector3d FloaterPos = FloaterInfo.GetPos();
Vector3d FloaterPos = FloaterInfo.GetBitePos();
FloaterPos.y += 0.5f;
const float FISH_SPEED_MULT = 2.25f;
Vector3d FlyDirection = a_Player->GetEyePosition() - FloaterPos;
a_World->SpawnItemPickups(Drops, FloaterPos.x, FloaterPos.y, FloaterPos.z, FlyDirection.x, FlyDirection.y + 1, FlyDirection.z);
a_World->SpawnItemPickups(Drops, FloaterPos.x, FloaterPos.y, FloaterPos.z, FlyDirection.x * FISH_SPEED_MULT, (FlyDirection.y + 1.0f) * FISH_SPEED_MULT, FlyDirection.z * FISH_SPEED_MULT);
cRoot::Get()->GetPluginManager()->CallHookPlayerFished(*a_Player, Drops);
}
}