summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--MCServer/furnace.txt3
-rw-r--r--src/BlockID.cpp4
-rw-r--r--src/Entities/Entity.h2
-rw-r--r--src/Entities/Player.cpp2
-rw-r--r--src/Entities/Player.h3
5 files changed, 6 insertions, 8 deletions
diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt
index 229a939ff..d6177184b 100644
--- a/MCServer/furnace.txt
+++ b/MCServer/furnace.txt
@@ -87,4 +87,5 @@
! 271:1 = 200 # 1 Wooden Axe -> 10 sec
! 269:1 = 200 # 1 Wooden Shovel -> 10 sec
! 290:1 = 200 # 1 Wooden Hoe -> 10 sec
-! 268:1 = 200 # 1 Wooden Sword -> 10 sec \ No newline at end of file
+! 268:1 = 200 # 1 Wooden Sword -> 10 sec
+
diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index 641a6a225..70cb801b6 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -355,12 +355,8 @@ AString DimensionToString(eDimension a_Dimension)
} DimensionMap[] =
{
{ dimOverworld, "Overworld" },
- { dimOverworld, "Normal" },
- { dimOverworld, "World" },
{ dimNether, "Nether" },
- { dimNether, "Hell" }, // Alternate name for Nether
{ dimEnd, "End" },
- { dimEnd, "Sky" }, // Old name for End
};
for (size_t i = 0; i < ARRAYCOUNT(DimensionMap); i++)
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; }