Merge branch 'master' into runMCServer
This commit is contained in:
commit
9015e56c60
@ -50,6 +50,8 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
|
|||||||
, m_TicksSinceLastFireDamage(0)
|
, m_TicksSinceLastFireDamage(0)
|
||||||
, m_TicksLeftBurning(0)
|
, m_TicksLeftBurning(0)
|
||||||
, m_TicksSinceLastVoidDamage(0)
|
, m_TicksSinceLastVoidDamage(0)
|
||||||
|
, m_IsSwimming(false)
|
||||||
|
, m_IsSubmerged(false)
|
||||||
, m_HeadYaw( 0.0 )
|
, m_HeadYaw( 0.0 )
|
||||||
, m_Rot(0.0, 0.0, 0.0)
|
, m_Rot(0.0, 0.0, 0.0)
|
||||||
, m_Pos(a_X, a_Y, a_Z)
|
, m_Pos(a_X, a_Y, a_Z)
|
||||||
@ -57,8 +59,6 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
|
|||||||
, m_Mass (0.001) // Default 1g
|
, m_Mass (0.001) // Default 1g
|
||||||
, m_Width(a_Width)
|
, m_Width(a_Width)
|
||||||
, m_Height(a_Height)
|
, m_Height(a_Height)
|
||||||
, m_IsSubmerged(false)
|
|
||||||
, m_IsSwimming(false)
|
|
||||||
{
|
{
|
||||||
cCSLock Lock(m_CSCount);
|
cCSLock Lock(m_CSCount);
|
||||||
m_EntityCount++;
|
m_EntityCount++;
|
||||||
|
@ -103,10 +103,10 @@ protected:
|
|||||||
|
|
||||||
cFloater::cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID, int a_CountDownTime) :
|
cFloater::cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID, int a_CountDownTime) :
|
||||||
cEntity(etFloater, a_X, a_Y, a_Z, 0.2, 0.2),
|
cEntity(etFloater, a_X, a_Y, a_Z, 0.2, 0.2),
|
||||||
m_PickupCountDown(0),
|
|
||||||
m_PlayerID(a_PlayerID),
|
|
||||||
m_CanPickupItem(false),
|
m_CanPickupItem(false),
|
||||||
|
m_PickupCountDown(0),
|
||||||
m_CountDownTime(a_CountDownTime),
|
m_CountDownTime(a_CountDownTime),
|
||||||
|
m_PlayerID(a_PlayerID),
|
||||||
m_AttachedMobID(-1)
|
m_AttachedMobID(-1)
|
||||||
{
|
{
|
||||||
SetSpeed(a_Speed);
|
SetSpeed(a_Speed);
|
||||||
|
@ -24,11 +24,11 @@ class cMinecartCollisionCallback :
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
cMinecartCollisionCallback(Vector3d a_Pos, double a_Height, double a_Width, int a_UniqueID, int a_AttacheeUniqueID) :
|
cMinecartCollisionCallback(Vector3d a_Pos, double a_Height, double a_Width, int a_UniqueID, int a_AttacheeUniqueID) :
|
||||||
|
m_DoesInteserct(false),
|
||||||
|
m_CollidedEntityPos(0, 0, 0),
|
||||||
m_Pos(a_Pos),
|
m_Pos(a_Pos),
|
||||||
m_Height(a_Height),
|
m_Height(a_Height),
|
||||||
m_Width(a_Width),
|
m_Width(a_Width),
|
||||||
m_DoesInteserct(false),
|
|
||||||
m_CollidedEntityPos(0, 0, 0),
|
|
||||||
m_UniqueID(a_UniqueID),
|
m_UniqueID(a_UniqueID),
|
||||||
m_AttacheeUniqueID(a_AttacheeUniqueID)
|
m_AttacheeUniqueID(a_AttacheeUniqueID)
|
||||||
{
|
{
|
||||||
@ -1057,8 +1057,8 @@ void cMinecartWithChest::OnRightClicked(cPlayer & a_Player)
|
|||||||
|
|
||||||
cMinecartWithFurnace::cMinecartWithFurnace(double a_X, double a_Y, double a_Z) :
|
cMinecartWithFurnace::cMinecartWithFurnace(double a_X, double a_Y, double a_Z) :
|
||||||
super(mpFurnace, a_X, a_Y, a_Z),
|
super(mpFurnace, a_X, a_Y, a_Z),
|
||||||
m_IsFueled(false),
|
m_FueledTimeLeft(-1),
|
||||||
m_FueledTimeLeft(-1)
|
m_IsFueled(false)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1137,4 +1137,4 @@ cMinecartWithHopper::cMinecartWithHopper(double a_X, double a_Y, double a_Z) :
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Make it suck up blocks and travel further than any other cart and physics and put and take blocks
|
// TODO: Make it suck up blocks and travel further than any other cart and physics and put and take blocks
|
||||||
// AND AVARYTHING!!
|
// AND AVARYTHING!!
|
||||||
|
@ -22,9 +22,9 @@ class cPickupCombiningCallback :
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
cPickupCombiningCallback(Vector3d a_Position, cPickup * a_Pickup) :
|
cPickupCombiningCallback(Vector3d a_Position, cPickup * a_Pickup) :
|
||||||
|
m_FoundMatchingPickup(false),
|
||||||
m_Position(a_Position),
|
m_Position(a_Position),
|
||||||
m_Pickup(a_Pickup),
|
m_Pickup(a_Pickup)
|
||||||
m_FoundMatchingPickup(false)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,19 +3,34 @@
|
|||||||
|
|
||||||
#include "Group.h"
|
#include "Group.h"
|
||||||
|
|
||||||
void cGroup::AddCommand( std::string a_Command )
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cGroup::AddCommand( AString a_Command )
|
||||||
{
|
{
|
||||||
m_Commands[ a_Command ] = true;
|
m_Commands[ a_Command ] = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cGroup::AddPermission( std::string a_Permission )
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cGroup::AddPermission( AString a_Permission )
|
||||||
{
|
{
|
||||||
m_Permissions[ a_Permission ] = true;
|
m_Permissions[ a_Permission ] = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cGroup::HasCommand( std::string a_Command )
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
bool cGroup::HasCommand( AString a_Command )
|
||||||
{
|
{
|
||||||
if( m_Commands.find("*") != m_Commands.end() ) return true;
|
if( m_Commands.find("*") != m_Commands.end() )
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
CommandMap::iterator itr = m_Commands.find( a_Command );
|
CommandMap::iterator itr = m_Commands.find( a_Command );
|
||||||
if( itr != m_Commands.end() )
|
if( itr != m_Commands.end() )
|
||||||
@ -34,4 +49,12 @@ void cGroup::InheritFrom( cGroup* a_Group )
|
|||||||
{
|
{
|
||||||
m_Inherits.remove( a_Group );
|
m_Inherits.remove( a_Group );
|
||||||
m_Inherits.push_back( a_Group );
|
m_Inherits.push_back( a_Group );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cGroup::ClearPermission()
|
||||||
|
{
|
||||||
|
m_Permissions.clear();
|
||||||
}
|
}
|
24
src/Group.h
24
src/Group.h
@ -11,19 +11,21 @@ public: // tolua_export
|
|||||||
cGroup() {}
|
cGroup() {}
|
||||||
~cGroup() {}
|
~cGroup() {}
|
||||||
|
|
||||||
void SetName( std::string a_Name ) { m_Name = a_Name; } // tolua_export
|
void SetName( AString a_Name ) { m_Name = a_Name; } // tolua_export
|
||||||
const std::string & GetName() const { return m_Name; } // tolua_export
|
const AString & GetName() const { return m_Name; } // tolua_export
|
||||||
void SetColor( std::string a_Color ) { m_Color = a_Color; } // tolua_export
|
void SetColor( AString a_Color ) { m_Color = a_Color; } // tolua_export
|
||||||
void AddCommand( std::string a_Command ); // tolua_export
|
void AddCommand( AString a_Command ); // tolua_export
|
||||||
void AddPermission( std::string a_Permission ); // tolua_export
|
void AddPermission( AString a_Permission ); // tolua_export
|
||||||
void InheritFrom( cGroup* a_Group ); // tolua_export
|
void InheritFrom( cGroup* a_Group ); // tolua_export
|
||||||
|
|
||||||
bool HasCommand( std::string a_Command ); // tolua_export
|
bool HasCommand( AString a_Command ); // tolua_export
|
||||||
|
|
||||||
typedef std::map< std::string, bool > PermissionMap;
|
typedef std::map< AString, bool > PermissionMap;
|
||||||
const PermissionMap & GetPermissions() const { return m_Permissions; }
|
const PermissionMap & GetPermissions() const { return m_Permissions; }
|
||||||
|
|
||||||
typedef std::map< std::string, bool > CommandMap;
|
void ClearPermission(void);
|
||||||
|
|
||||||
|
typedef std::map< AString, bool > CommandMap;
|
||||||
const CommandMap & GetCommands() const { return m_Commands; }
|
const CommandMap & GetCommands() const { return m_Commands; }
|
||||||
|
|
||||||
const AString & GetColor() const { return m_Color; } // tolua_export
|
const AString & GetColor() const { return m_Color; } // tolua_export
|
||||||
@ -31,8 +33,8 @@ public: // tolua_export
|
|||||||
typedef std::list< cGroup* > GroupList;
|
typedef std::list< cGroup* > GroupList;
|
||||||
const GroupList & GetInherits() const { return m_Inherits; }
|
const GroupList & GetInherits() const { return m_Inherits; }
|
||||||
private:
|
private:
|
||||||
std::string m_Name;
|
AString m_Name;
|
||||||
std::string m_Color;
|
AString m_Color;
|
||||||
|
|
||||||
PermissionMap m_Permissions;
|
PermissionMap m_Permissions;
|
||||||
CommandMap m_Commands;
|
CommandMap m_Commands;
|
||||||
|
@ -44,6 +44,18 @@ cGroupManager::cGroupManager()
|
|||||||
: m_pState( new sGroupManagerState )
|
: m_pState( new sGroupManagerState )
|
||||||
{
|
{
|
||||||
LOGD("-- Loading Groups --");
|
LOGD("-- Loading Groups --");
|
||||||
|
|
||||||
|
LoadGroups();
|
||||||
|
|
||||||
|
LOGD("-- Groups Successfully Loaded --");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cGroupManager::LoadGroups()
|
||||||
|
{
|
||||||
cIniFile IniFile;
|
cIniFile IniFile;
|
||||||
if (!IniFile.ReadFile("groups.ini"))
|
if (!IniFile.ReadFile("groups.ini"))
|
||||||
{
|
{
|
||||||
@ -71,8 +83,10 @@ cGroupManager::cGroupManager()
|
|||||||
unsigned int NumKeys = IniFile.GetNumKeys();
|
unsigned int NumKeys = IniFile.GetNumKeys();
|
||||||
for (size_t i = 0; i < NumKeys; i++)
|
for (size_t i = 0; i < NumKeys; i++)
|
||||||
{
|
{
|
||||||
std::string KeyName = IniFile.GetKeyName( i );
|
AString KeyName = IniFile.GetKeyName( i );
|
||||||
cGroup* Group = GetGroup( KeyName.c_str() );
|
cGroup* Group = GetGroup( KeyName.c_str() );
|
||||||
|
|
||||||
|
Group->ClearPermission(); // Needed in case the groups are reloaded.
|
||||||
|
|
||||||
LOGD("Loading group: %s", KeyName.c_str() );
|
LOGD("Loading group: %s", KeyName.c_str() );
|
||||||
|
|
||||||
@ -107,7 +121,7 @@ cGroupManager::cGroupManager()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string Groups = IniFile.GetValue(KeyName, "Inherits", "");
|
AString Groups = IniFile.GetValue(KeyName, "Inherits", "");
|
||||||
if (!Groups.empty())
|
if (!Groups.empty())
|
||||||
{
|
{
|
||||||
AStringVector Split = StringSplitAndTrim(Groups, ",");
|
AStringVector Split = StringSplitAndTrim(Groups, ",");
|
||||||
@ -117,7 +131,6 @@ cGroupManager::cGroupManager()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LOGD("-- Groups Successfully Loaded --");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@ class cGroupManager
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
cGroup * GetGroup(const AString & a_Name);
|
cGroup * GetGroup(const AString & a_Name);
|
||||||
|
void LoadGroups(void);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class cRoot;
|
friend class cRoot;
|
||||||
|
@ -55,9 +55,9 @@ public:
|
|||||||
m_ItemType (a_ItemType),
|
m_ItemType (a_ItemType),
|
||||||
m_ItemCount (a_ItemCount),
|
m_ItemCount (a_ItemCount),
|
||||||
m_ItemDamage (a_ItemDamage),
|
m_ItemDamage (a_ItemDamage),
|
||||||
m_Enchantments(a_Enchantments),
|
|
||||||
m_CustomName (a_CustomName),
|
m_CustomName (a_CustomName),
|
||||||
m_Lore (a_Lore)
|
m_Lore (a_Lore),
|
||||||
|
m_Enchantments(a_Enchantments)
|
||||||
{
|
{
|
||||||
if (!IsValidItem(m_ItemType))
|
if (!IsValidItem(m_ItemType))
|
||||||
{
|
{
|
||||||
@ -75,9 +75,9 @@ public:
|
|||||||
m_ItemType (a_CopyFrom.m_ItemType),
|
m_ItemType (a_CopyFrom.m_ItemType),
|
||||||
m_ItemCount (a_CopyFrom.m_ItemCount),
|
m_ItemCount (a_CopyFrom.m_ItemCount),
|
||||||
m_ItemDamage (a_CopyFrom.m_ItemDamage),
|
m_ItemDamage (a_CopyFrom.m_ItemDamage),
|
||||||
m_Enchantments(a_CopyFrom.m_Enchantments),
|
|
||||||
m_CustomName (a_CopyFrom.m_CustomName),
|
m_CustomName (a_CopyFrom.m_CustomName),
|
||||||
m_Lore (a_CopyFrom.m_Lore)
|
m_Lore (a_CopyFrom.m_Lore),
|
||||||
|
m_Enchantments(a_CopyFrom.m_Enchantments)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,20 +69,20 @@ cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString
|
|||||||
: super(etMonster, a_Width, a_Height)
|
: super(etMonster, a_Width, a_Height)
|
||||||
, m_EMState(IDLE)
|
, m_EMState(IDLE)
|
||||||
, m_EMPersonality(AGGRESSIVE)
|
, m_EMPersonality(AGGRESSIVE)
|
||||||
, m_SightDistance(25)
|
|
||||||
, m_Target(NULL)
|
, m_Target(NULL)
|
||||||
, m_AttackRate(3)
|
|
||||||
, m_IdleInterval(0)
|
|
||||||
, m_bMovingToDestination(false)
|
, m_bMovingToDestination(false)
|
||||||
|
, m_LastGroundHeight(POSY_TOINT)
|
||||||
|
, m_IdleInterval(0)
|
||||||
, m_DestroyTimer(0)
|
, m_DestroyTimer(0)
|
||||||
, m_MobType(a_MobType)
|
, m_MobType(a_MobType)
|
||||||
, m_SoundHurt(a_SoundHurt)
|
, m_SoundHurt(a_SoundHurt)
|
||||||
, m_SoundDeath(a_SoundDeath)
|
, m_SoundDeath(a_SoundDeath)
|
||||||
|
, m_AttackRate(3)
|
||||||
, m_AttackDamage(1)
|
, m_AttackDamage(1)
|
||||||
, m_AttackRange(2)
|
, m_AttackRange(2)
|
||||||
, m_AttackInterval(0)
|
, m_AttackInterval(0)
|
||||||
|
, m_SightDistance(25)
|
||||||
, m_BurnsInDaylight(false)
|
, m_BurnsInDaylight(false)
|
||||||
, m_LastGroundHeight(POSY_TOINT)
|
|
||||||
{
|
{
|
||||||
if (!a_ConfigName.empty())
|
if (!a_ConfigName.empty())
|
||||||
{
|
{
|
||||||
|
@ -13,9 +13,9 @@
|
|||||||
|
|
||||||
cVillager::cVillager(eVillagerType VillagerType) :
|
cVillager::cVillager(eVillagerType VillagerType) :
|
||||||
super("Villager", mtVillager, "", "", 0.6, 1.8),
|
super("Villager", mtVillager, "", "", 0.6, 1.8),
|
||||||
|
m_ActionCountDown(-1),
|
||||||
m_Type(VillagerType),
|
m_Type(VillagerType),
|
||||||
m_VillagerAction(false),
|
m_VillagerAction(false)
|
||||||
m_ActionCountDown(-1)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -536,6 +536,15 @@ void cRoot::SaveAllChunks(void)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cRoot::ReloadGroups(void)
|
||||||
|
{
|
||||||
|
m_GroupManager->LoadGroups();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cRoot::BroadcastChat(const AString & a_Message)
|
void cRoot::BroadcastChat(const AString & a_Message)
|
||||||
{
|
{
|
||||||
for (WorldMap::iterator itr = m_WorldsByName.begin(), end = m_WorldsByName.end(); itr != end; ++itr)
|
for (WorldMap::iterator itr = m_WorldsByName.begin(), end = m_WorldsByName.end(); itr != end; ++itr)
|
||||||
|
@ -98,6 +98,9 @@ public:
|
|||||||
/// Saves all chunks in all worlds
|
/// Saves all chunks in all worlds
|
||||||
void SaveAllChunks(void); // tolua_export
|
void SaveAllChunks(void); // tolua_export
|
||||||
|
|
||||||
|
/// Reloads all the groups
|
||||||
|
void ReloadGroups(void); // tolua_export
|
||||||
|
|
||||||
/// Sends a chat message to all connected clients (in all worlds)
|
/// Sends a chat message to all connected clients (in all worlds)
|
||||||
void BroadcastChat(const AString & a_Message); // tolua_export
|
void BroadcastChat(const AString & a_Message); // tolua_export
|
||||||
|
|
||||||
|
@ -197,8 +197,8 @@ cTeam::cTeam(const AString & a_Name, const AString & a_DisplayName,
|
|||||||
const AString & a_Prefix, const AString & a_Suffix)
|
const AString & a_Prefix, const AString & a_Suffix)
|
||||||
: m_AllowsFriendlyFire(true)
|
: m_AllowsFriendlyFire(true)
|
||||||
, m_CanSeeFriendlyInvisible(false)
|
, m_CanSeeFriendlyInvisible(false)
|
||||||
, m_Name(a_Name)
|
|
||||||
, m_DisplayName(a_DisplayName)
|
, m_DisplayName(a_DisplayName)
|
||||||
|
, m_Name(a_Name)
|
||||||
, m_Prefix(a_Prefix)
|
, m_Prefix(a_Prefix)
|
||||||
, m_Suffix(a_Suffix)
|
, m_Suffix(a_Suffix)
|
||||||
{}
|
{}
|
||||||
|
@ -946,11 +946,11 @@ void cRedstoneSimulator::HandlePressurePlate(int a_BlockX, int a_BlockY, int a_B
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
cWoodenPressurePlateCallback(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
|
cWoodenPressurePlateCallback(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
|
||||||
|
m_Entity(NULL),
|
||||||
|
m_World(a_World),
|
||||||
m_X(a_BlockX),
|
m_X(a_BlockX),
|
||||||
m_Y(a_BlockY),
|
m_Y(a_BlockY),
|
||||||
m_Z(a_BlockZ),
|
m_Z(a_BlockZ)
|
||||||
m_World(a_World),
|
|
||||||
m_Entity(NULL)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -247,9 +247,9 @@ cWorld::cWorld(const AString & a_WorldName) :
|
|||||||
m_SkyDarkness(0),
|
m_SkyDarkness(0),
|
||||||
m_Weather(eWeather_Sunny),
|
m_Weather(eWeather_Sunny),
|
||||||
m_WeatherInterval(24000), // Guaranteed 1 day of sunshine at server start :)
|
m_WeatherInterval(24000), // Guaranteed 1 day of sunshine at server start :)
|
||||||
|
m_Scoreboard(this),
|
||||||
m_GeneratorCallbacks(*this),
|
m_GeneratorCallbacks(*this),
|
||||||
m_TickThread(*this),
|
m_TickThread(*this)
|
||||||
m_Scoreboard(this)
|
|
||||||
{
|
{
|
||||||
LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str());
|
LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str());
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user