summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-06-16 05:27:27 +0200
committerarchshift <admin@archshift.com>2014-06-16 05:27:27 +0200
commitb2fbcaf1bf43ca1f0e6df48de8584149cbe50222 (patch)
tree7ba7d6eb31dec126b16cde36a0982486b7c59aa7 /src/Entities
parentReverted portal creation code (diff)
downloadcuberite-b2fbcaf1bf43ca1f0e6df48de8584149cbe50222.tar
cuberite-b2fbcaf1bf43ca1f0e6df48de8584149cbe50222.tar.gz
cuberite-b2fbcaf1bf43ca1f0e6df48de8584149cbe50222.tar.bz2
cuberite-b2fbcaf1bf43ca1f0e6df48de8584149cbe50222.tar.lz
cuberite-b2fbcaf1bf43ca1f0e6df48de8584149cbe50222.tar.xz
cuberite-b2fbcaf1bf43ca1f0e6df48de8584149cbe50222.tar.zst
cuberite-b2fbcaf1bf43ca1f0e6df48de8584149cbe50222.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.h2
-rw-r--r--src/Entities/Player.cpp2
-rw-r--r--src/Entities/Player.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 9f3b06c29..8975803a2 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -509,7 +509,7 @@ protected:
int m_AirTickTimer;
/** Portal delay timer and cooldown boolean
- First value is to delay sending the repsawn packet (which triggers the Entering the {Dimension} screen).
+ First value is to delay sending the respawn packet (which triggers the Entering the {Dimension} screen).
Second value is to prevent a teleportation loop by ensuring we do not reenter a portal that we came out of.
*/
std::pair<unsigned short, bool> m_PortalCooldownData;
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index a346e68cf..c26c18690 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1651,7 +1651,7 @@ void cPlayer::LoadPermissionsFromDisk()
-bool cPlayer::LoadFromDisk(cWorld *& a_World)
+bool cPlayer::LoadFromDisk(cWorldPtr & a_World)
{
a_World = cRoot::Get()->GetWorld(GetLoadedWorldName());
if (a_World == NULL)
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 8f319f1ae..b1fef1b68 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -335,10 +335,11 @@ public:
/** Saves all player data, such as inventory, to JSON */
bool SaveToDisk(void);
+ typedef cWorld * cWorldPtr;
/** Loads player data from JSON to the object
Takes a (NULL) cWorld pointer which it will assign a value to based on either the loaded world or default world
*/
- bool LoadFromDisk(cWorld *& a_World);
+ bool LoadFromDisk(cWorldPtr & a_World);
void LoadPermissionsFromDisk(void); // tolua_export
const AString & GetLoadedWorldName() { return m_LoadedWorldName; }