Merge branch 'cuberite:master' into master

CONTRIBUTORS

@@ -78,6 +78,7 @@ Seadragon91 (Lukas Pioch)
 Sofapriester
 Spekdrum (Pablo Beltran)
 SphinxC0re
+steve-nzr
 structinf (xdot)
 sweetgiorni
 Sxw1212

Jenkinsfile

@@ -1,4 +1,7 @@
 pipeline {
+    options {
+      timeout(time: 1, unit: 'HOURS') 
+    }
     agent {
         docker 'cuberite/docker-ci/minimal:latest'
     }

Server/Plugins/APIDump/APIDesc.lua

@@ -12292,7 +12292,7 @@ end
 							Type = "cTeam",
 						},
 					},
-					Notes = "Registers a new team. Returns the {{cTeam}} instance, nil on error.",
+					Notes = "Registers a new team. Returns the {{cTeam}} instance, nil on error. For example if the team already exists.",
 				},
 				RemoveObjective =
 				{

Server/Plugins/APIDump/Classes/World.lua

@@ -2315,6 +2315,27 @@ function OnAllChunksAvailable()</pre> All return values from the callbacks are i
 				},
 				Notes = "Returns whether or not saving chunk data is enabled. If disabled, the world will keep dirty chunks in memory forever, and will simply regenerate non-dirty chunks that are unloaded.",
 			},
+			IsSlimeChunk =
+			{
+				Params =
+				{
+					{
+						Name = "ChunkX",
+						Type = "number",
+					},
+					{
+						Name = "ChunkZ",
+						Type = "number",
+					},
+				},
+				Returns =
+				{
+					{
+						Type = "boolean",
+					},
+				},
+				Notes = "Returns whether slimes can spawn in the chunk.",
+			},
 			IsTrapdoorOpen =
 			{
 				Params =

src/Chunk.cpp

@@ -1980,3 +1980,12 @@ NIBBLETYPE cChunk::GetTimeAlteredLight(NIBBLETYPE a_Skylight) const
 	// Because NIBBLETYPE is unsigned, we clamp it to 0 .. 15 by checking for values above 15
 	return (a_Skylight < 16)? a_Skylight : 0;
 }
+
+
+
+
+
+bool cChunk::IsSlimeChunk() const
+{
+	return m_World->IsSlimeChunk(m_PosX, m_PosZ);
+}

src/Chunk.h

@@ -452,6 +452,8 @@ class cChunk
 		return cChunkDef::RelativeToAbsolute(a_RelBlockPosition, {m_PosX, m_PosZ});
 	}
 
+	/** Returns true if slimes should spawn in the chunk. */
+	bool IsSlimeChunk() const;
 
 private:
 

src/MobSpawner.cpp

@@ -220,7 +220,10 @@ bool cMobSpawner::CanSpawnHere(cChunk * a_Chunk, Vector3i a_RelPos, eMonsterType
 					(!cBlockInfo::IsTransparent(BlockBelow)) ||
 					(a_DisableSolidBelowCheck)) &&
 				(
-					(a_RelPos.y <= 40) ||
+					(
+						(a_RelPos.y <= 40) &&
+						a_Chunk->IsSlimeChunk()
+					) ||
 					(
 						(a_Biome == biSwampland) &&
 						(a_RelPos.y >= 50) &&

src/RankManager.cpp

@@ -17,8 +17,7 @@
 
 cRankManager::cRankManager(void) :
 	m_DB("Ranks.sqlite", SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE),
-	m_IsInitialized(false),
-	m_MojangAPI(nullptr)
+	m_IsInitialized(false)
 {
 }
 
@@ -28,10 +27,6 @@ cRankManager::cRankManager(void) :
 
 cRankManager::~cRankManager()
 {
-	if (m_MojangAPI != nullptr)
-	{
-		m_MojangAPI->SetRankManager(nullptr);
-	}
 }
 
 

src/RankManager.h

@@ -273,11 +273,6 @@ class cRankManager
 	/** Set to true once the manager is initialized. */
 	bool m_IsInitialized;
 
-	/** The MojangAPI instance that is used for keeping player names and UUIDs in sync.
-	Set in Initialize(), may be nullptr. */
-	cMojangAPI * m_MojangAPI;
-
-
 	/** Returns true if all the DB tables are empty, indicating a fresh new install. */
 	bool AreDBTablesEmpty(void);
 

src/Scoreboard.cpp

@@ -361,11 +361,15 @@ cTeam * cScoreboard::RegisterTeam(
 	const AString & a_Prefix, const AString & a_Suffix
 )
 {
-	cTeam Team(a_Name, a_DisplayName, a_Prefix, a_Suffix);
+	auto [TeamIterator, TeamExists] = m_Teams.try_emplace(a_Name, a_Name, a_DisplayName, a_Prefix, a_Suffix);
 
-	std::pair<cTeamMap::iterator, bool> Status = m_Teams.insert(cNamedTeam(a_Name, Team));
+	if (!TeamExists && GetTeam(a_Name))
+	{
+		LOGWARNING("Tried to register a team that already exists: %s", a_Name.c_str());
+		return nullptr;
+	}
 
-	return Status.second ? &Status.first->second : nullptr;
+	return &TeamIterator->second;
 }
 
 

src/World.cpp

@@ -3229,3 +3229,13 @@ void cWorld::cChunkGeneratorCallbacks::CallHookChunkGenerated (cChunkDesc & a_Ch
 		*m_World, a_ChunkDesc.GetChunkX(), a_ChunkDesc.GetChunkZ(), &a_ChunkDesc
 	);
 }
+
+
+
+
+
+bool cWorld::IsSlimeChunk(int a_ChunkX, int a_ChunkZ) const
+{
+	cNoise Noise(GetSeed());
+	return (Noise.IntNoise2DInt(a_ChunkX, a_ChunkZ) / 8) % 10 == 0;  // 10% chance
+}

src/World.h

@@ -843,7 +843,7 @@ class cWorld  // tolua_export
 	virtual bool IsWeatherWetAtXYZ(Vector3i a_Position) override;
 
 	/** Returns the seed of the world. */
-	int GetSeed(void) { return m_Generator.GetSeed(); }
+	int GetSeed(void) const { return m_Generator.GetSeed(); }
 
 	// tolua_end
 
@@ -892,6 +892,8 @@ class cWorld  // tolua_export
 	as at least one requests is active the chunk will be ticked). */
 	void SetChunkAlwaysTicked(int a_ChunkX, int a_ChunkZ, bool a_AlwaysTicked = true);  // tolua_export
 
+	/** Returns true if slimes should spawn in the chunk. */
+	bool IsSlimeChunk(int a_ChunkX, int a_ChunkZ) const;  // tolua_export
 private:
 
 	class cTickThread: