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

Preparing 1.8 update

Browse Source
This commit is contained in:
nesco 2014-09-17 17:15:47 +02:00
parent 89c9aec5da
commit c63e14b6d1
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Entities/Player.cpp
View File

@ -451,6 +451,11 @@ void cPlayer::CancelChargingBow(void)
void cPlayer::SetTouchGround(bool a_bTouchGround) void cPlayer::SetTouchGround(bool a_bTouchGround)
{ {
if (IsGameModeSpectator()) // You can fly through the ground in survival
{
return;
}
m_bTouchGround = a_bTouchGround; m_bTouchGround = a_bTouchGround;
if (!m_bTouchGround) if (!m_bTouchGround)
@ -585,7 +590,7 @@ bool cPlayer::Feed(int a_Food, double a_Saturation)
void cPlayer::AddFoodExhaustion(double a_Exhaustion) void cPlayer::AddFoodExhaustion(double a_Exhaustion)
{ {
if (!IsGameModeCreative()) if (!(IsGameModeCreative() || IsGameModeSpectator()))
{ {
m_FoodExhaustionLevel = std::min(m_FoodExhaustionLevel + a_Exhaustion, 40.0); m_FoodExhaustionLevel = std::min(m_FoodExhaustionLevel + a_Exhaustion, 40.0);
} }
@ -823,9 +828,9 @@ bool cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
{ {
if ((a_TDI.DamageType != dtInVoid) && (a_TDI.DamageType != dtPlugin)) if ((a_TDI.DamageType != dtInVoid) && (a_TDI.DamageType != dtPlugin))
{ {
if (IsGameModeCreative()) if (IsGameModeCreative() || IsGameModeSpectator())
{ {
// No damage / health in creative mode if not void or plugin damage // No damage / health in creative or spectator mode if not void or plugin damage
return false; return false;
} }
} }
@ -1348,7 +1353,7 @@ void cPlayer::MoveTo( const Vector3d & a_NewPos)
void cPlayer::SetVisible(bool a_bVisible) void cPlayer::SetVisible(bool a_bVisible)
{ {
// Need to Check if this or other players are in gamemode spectator // Need to Check if the player or other players are in gamemode spectator, but will break compatibility
if (a_bVisible && !m_bVisible) // Make visible if (a_bVisible && !m_bVisible) // Make visible
{ {
m_bVisible = true; m_bVisible = true;
@ -1509,6 +1514,11 @@ void cPlayer::TossPickup(const cItem & a_Item)
void cPlayer::TossItems(const cItems & a_Items) void cPlayer::TossItems(const cItems & a_Items)
{ {
if (IsGameModeSpectator()) // Players can't toss items in spectator
{
return;
}
m_Stats.AddValue(statItemsDropped, (StatValue)a_Items.Size()); m_Stats.AddValue(statItemsDropped, (StatValue)a_Items.Size());
double vX = 0, vY = 0, vZ = 0; double vX = 0, vY = 0, vZ = 0;
@ -1795,7 +1805,7 @@ bool cPlayer::SaveToDisk()
void cPlayer::UseEquippedItem(int a_Amount) void cPlayer::UseEquippedItem(int a_Amount)
{ {
if (IsGameModeCreative()) // No damage in creative if (IsGameModeCreative() || IsGameModeSpectator()) // No damage in creative or spectator
{ {
return; return;
} }