4 files changed, 63 insertions, 8 deletions

diff --git a/MCServer/Plugins/APIDump/Classes/Projectiles.lua b/MCServer/Plugins/APIDump/Classes/Projectiles.lua
index 08c981e5d..aef6a048c 100644
--- a/MCServer/Plugins/APIDump/Classes/Projectiles.lua
+++ b/MCServer/Plugins/APIDump/Classes/Projectiles.lua
@@ -35,12 +35,49 @@ return
 		Inherits = "cProjectileEntity",
 	},  -- cArrowEntity
 
+	cExpBottleEntity =
+	{
+		Desc = [[
+			Represents a thrown ExpBottle. A subclass of the {{cProjectileEntity}}.
+		]],
+		Functions =
+		{
+		},
+		Inherits = "cProjectileEntity",
+	},  -- cExpBottleEntity
+
 	cFireChargeEntity =
 	{
-		Desc = "",
+		Desc = [[
+			Represents a fire charge that has been shot by a Blaze or a {{cDispenserEntity|Dispenser}}. A subclass
+			of the {{cProjectileEntity}}.
+		]],
 		Functions = {},
 		Inherits = "cProjectileEntity",
 	},  -- cFireChargeEntity
+	
+	cFireworkEntity =
+	{
+		Desc = [[
+			Represents a firework rocket.
+		]],
+			Functions =
+			{
+				GetItem = { Params = "", Return = "{{cItem}}", Notes = "Returns the item that has been used to create the firework rocket. The item's m_FireworkItem member contains all the firework-related data." },
+				GetTicksToExplosion = { Params = "", Return = "number", Notes = "Returns the number of ticks left until the firework explodes." },
+				SetItem = { Params = "{{cItem}}", Return = "", Notes = "Sets a new item to be used for the firework." },
+				SetTicksToExplosion = { Params = "NumTicks", Return = "", Notes = "Sets the number of ticks left until the firework explodes." },
+			},
+
+		Inherits = "cProjectileEntity",
+	},  -- cFireworkEntity
+
+	cFloater =
+	{
+		Desc = "",
+		Functions = {},
+		Inherits = "cProjectileEntity",
+	},  -- cFloater
 
 	cGhastFireballEntity =
 	{
@@ -64,14 +101,14 @@ return
 			pkArrow = { Notes = "The projectile is an {{cArrowEntity|arrow}}" },
 			pkEgg = { Notes = "The projectile is a {{cThrownEggEntity|thrown egg}}" },
 			pkEnderPearl = { Notes = "The projectile is a {{cThrownEnderPearlEntity|thrown enderpearl}}" },
-			pkExpBottle = { Notes = "The projectile is a thrown exp bottle (NYI)" },
+			pkExpBottle = { Notes = "The projectile is a {{cExpBottleEntity|thrown exp bottle}}" },
 			pkFireCharge = { Notes = "The projectile is a {{cFireChargeEntity|fire charge}}" },
-			pkFirework = { Notes = "The projectile is a (flying) firework (NYI)" },
-			pkFishingFloat = { Notes = "The projectile is a fishing float (NYI)" },
+			pkFirework = { Notes = "The projectile is a (flying) {{cFireworkEntity|firework}}" },
+			pkFishingFloat = { Notes = "The projectile is a {{cFloater|fishing float}}" },
 			pkGhastFireball = { Notes = "The projectile is a {{cGhastFireballEntity|ghast fireball}}" },
 			pkSnowball = { Notes = "The projectile is a {{cThrownSnowballEntity|thrown snowball}}" },
-			pkSplashPotion = { Notes = "The projectile is a thrown splash potion (NYI)" },
-			pkWitherSkull = { Notes = "The projectile is a wither skull (NYI)" },
+			pkSplashPotion = { Notes = "The projectile is a {{cSplashPotionEntity|thrown splash potion}}" },
+			pkWitherSkull = { Notes = "The projectile is a {{cWitherSkullEntity|wither skull}}" },
 		},
 		ConstantGroups =
 		{
@@ -84,6 +121,13 @@ return
 		Inherits = "cEntity",
 	},  -- cProjectileEntity
 
+	cSplashPotionEntity =
+	{
+		Desc = "",
+		Functions = {},
+		Inherits = "cProjectileEntity",
+	},  -- cSplashPotionEntity
+
 	cThrownEggEntity =
 	{
 		Desc = "",
@@ -97,13 +141,20 @@ return
 		Functions = {},
 		Inherits = "cProjectileEntity",
 	},  -- cThrownEnderPearlEntity
-
+	
 	cThrownSnowballEntity =
 	{
 		Desc = "",
 		Functions = {},
 		Inherits = "cProjectileEntity",
 	},  -- cThrownSnowballEntity
+
+	cWitherSkullEntity =
+	{
+		Desc = "",
+		Functions = {},
+		Inherits = "cProjectileEntity",
+	},  -- cWitherSkullEntity
 }
 
 
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject f8c2531fbef9bfd0b6f024d4d3319384a70a083
+Subproject 4702471943511f641458c7e8e89b430a723f43e
diff --git a/MCServer/Plugins/InfoDump.lua b/MCServer/Plugins/InfoDump.lua
index bc9bab767..de1d1f451 100644
--- a/MCServer/Plugins/InfoDump.lua
+++ b/MCServer/Plugins/InfoDump.lua
@@ -625,7 +625,11 @@ local function LoadPluginInfo(a_FolderName)
 	-- This is Lua-5.1-specific and won't work in Lua 5.2!
 	local Sandbox = {}
 	setfenv(cfg, Sandbox)
-	cfg()
+	local isSuccess, errMsg = pcall(cfg)
+	if not(isSuccess) then
+		return nil, "Cannot load Info.lua: " .. (errMsg or "<unknown error>")
+	end
+	
 	if (Sandbox.g_PluginInfo == nil) then
 		return nil, "Info.lua doesn't contain the g_PluginInfo declaration"
 	end
diff --git a/MCServer/Plugins/ProtectionAreas b/MCServer/Plugins/ProtectionAreas
-Subproject 7765048fa740b8f119db72a4ccc546504f86b2a
+Subproject 624580e5b522ba2799dfe5b5902b4002b1a8da3