Merge pull request #123 from jan64/master

Fixed error when spawning non-mob entities in a peaceful world
cuberite · Mar 10, 2015 · 12826af · 12826af
2 parents 4938bb6 + 539ad33
commit 12826af
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/difficulties.lua b/difficulties.lua
@@ -80,6 +80,7 @@ local IsEntityBlockedInPeaceful =
 	["cZombie"]       = true,
 	["cZombiePigman"] = true,
 	["cSpider"]       = true,
+	["cCaveSpider"]   = true,
 	["cEnderman"]     = true,
 	["cEnderDragon"]  = true,
 	["cSkeleton"]     = true,
@@ -94,8 +95,9 @@ local IsEntityBlockedInPeaceful =
 }
 
 function OnSpawningEntity(World, Entity)
-	if (GetWorldDifficulty(World) == 0) then
-		return IsEntityBlockedInPeaceful[Entity:GetClass()]
+	local Ent = tolua.cast(Entity, "cEntity")
+	if (GetWorldDifficulty(World) == 0 and Ent:IsMob() == true) then
+		return IsEntityBlockedInPeaceful[Ent:GetClass()]
 	end
 	return false
 end