summaryrefslogtreecommitdiffstats
path: root/Server
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Server/Plugins/APIDump/APIDesc.lua29
-rw-r--r--Server/Plugins/APIDump/Classes/World.lua4
m---------Server/Plugins/Core0
m---------Server/Plugins/ProtectionAreas0
4 files changed, 19 insertions, 14 deletions
diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua
index 573837333..9a0b7a36e 100644
--- a/Server/Plugins/APIDump/APIDesc.lua
+++ b/Server/Plugins/APIDump/APIDesc.lua
@@ -3946,8 +3946,13 @@ local Hash = cCryptoHash.sha1HexString("DataToHash")
Type = "boolean",
IsOptional = true,
},
+ {
+ Name = "ShouldSendRespawn",
+ Type = "boolean",
+ IsOptional = true,
+ },
},
- Notes = "Schedules a MoveToWorld call to occur on the next Tick of the entity. If ShouldSetPortalCooldown is false (default), doesn't set any portal cooldown, if it is true, the default portal cooldown is applied to the entity.",
+ Notes = "Schedules a MoveToWorld call to occur on the next Tick of the entity. If ShouldSetPortalCooldown is false (default), doesn't set any portal cooldown, if it is true, the default portal cooldown is applied to the entity. If ShouldSendRespawn is false (default), no respawn packet is sent, if it is true then a respawn packet is sent to the client.",
},
SetGravity =
{
@@ -8670,7 +8675,7 @@ a_Player:OpenWindow(Window);
{
{
Name = "MobType",
- Type = "Globals#eMonsterType",
+ Type = "eMonsterType",
},
},
Returns =
@@ -8730,7 +8735,7 @@ a_Player:OpenWindow(Window);
{
{
Name = "MobType",
- Type = "Globals#eMonsterType",
+ Type = "eMonsterType",
},
},
Notes = "Returns the type of this mob ({{Globals#eMonsterType|mtXXX}} constant)",
@@ -8821,7 +8826,7 @@ a_Player:OpenWindow(Window);
{
{
Name = "MobType",
- Type = "Globals#eMonsterType",
+ Type = "eMonsterType",
},
},
Returns =
@@ -8839,7 +8844,7 @@ a_Player:OpenWindow(Window);
{
{
Name = "MobType",
- Type = "Globals#eMonsterType",
+ Type = "eMonsterType",
},
},
Returns =
@@ -8930,7 +8935,7 @@ a_Player:OpenWindow(Window);
{
{
Name = "MobType",
- Type = "Globals#eMonsterType",
+ Type = "eMonsterType",
},
},
Notes = "Returns the mob type ({{Globals#eMonsterType|mtXXX}} constant) parsed from the string type (\"creeper\"), or mtInvalidType if unrecognized.",
@@ -9996,7 +10001,7 @@ a_Player:OpenWindow(Window);
{
{
Name = "GameMode",
- Type = "Globals#eGameMode",
+ Type = "eGameMode",
},
},
Notes = "(OBSOLETE) Returns the current resolved game mode of the player. If the player is set to inherit the world's gamemode, returns that instead. See also GetGameMode() and IsGameModeXXX() functions. Note that this function is the same as GetGameMode(), use that function instead.",
@@ -10096,7 +10101,7 @@ a_Player:OpenWindow(Window);
{
{
Name = "GameMode",
- Type = "Globals#eGameMode",
+ Type = "eGameMode",
},
},
Notes = "Returns the player's gamemode. The player may have their gamemode unassigned, in which case they inherit the gamemode from the current {{cWorld|world}}.<br /> <b>NOTE:</b> Instead of comparing the value returned by this function to the gmXXX constants, use the IsGameModeXXX() functions. These functions handle the gamemode inheritance automatically.",
@@ -10881,7 +10886,7 @@ a_Player:OpenWindow(Window);
{
{
Name = "NewGameMode",
- Type = "Globals#eGameMode",
+ Type = "eGameMode",
},
},
Notes = "Sets the gamemode for the player. The new gamemode overrides the world's default gamemode, unless it is set to gmInherit.",
@@ -13885,7 +13890,7 @@ end
{
{
Name = "BiomeType",
- Type = "Globals#EMCSBiome",
+ Type = "EMCSBiome",
},
},
Notes = "Converts a string representation to a {{Globals#BiomeTypes|BiomeType}} enumerated value. Returns biInvalidBiome if the input is not a recognized biome.",
@@ -13903,7 +13908,7 @@ end
{
{
Name = "DamageType",
- Type = "Globals#eDamageType",
+ Type = "eDamageType",
},
},
Notes = "Converts a string representation to a {{Globals#DamageType|DamageType}} enumerated value. Returns -1 if the inupt is not a recognized damage type.",
@@ -13921,7 +13926,7 @@ end
{
{
Name = "Dimension",
- Type = "Globals#eDimension",
+ Type = "eDimension",
},
},
Notes = "Converts a string representation to a {{Globals#eDimension|eDimension}} enumerated value. Returns dimNotSet if the input is not a recognized dimension.",
diff --git a/Server/Plugins/APIDump/Classes/World.lua b/Server/Plugins/APIDump/Classes/World.lua
index d523f3881..63c2162e6 100644
--- a/Server/Plugins/APIDump/Classes/World.lua
+++ b/Server/Plugins/APIDump/Classes/World.lua
@@ -1820,7 +1820,7 @@ function OnAllChunksAvailable()</pre> All return values from the callbacks are i
{
{
Name = "ShrapnelLevel",
- Type = "Globals#eShrapnelLevel",
+ Type = "eShrapnelLevel",
},
},
Notes = "Returns the shrapnel level, representing the block types that are propelled outwards following an explosion. Based on this value and a random picker, blocks are selectively converted to physics entities (FallingSand) and flung outwards.",
@@ -2830,7 +2830,7 @@ function OnAllChunksAvailable()</pre> All return values from the callbacks are i
{
{
Name = "ShrapnelLevel",
- Type = "Globals#eShrapnelLevel",
+ Type = "eShrapnelLevel",
},
},
Notes = "Sets the Shrapnel level of the world.",
diff --git a/Server/Plugins/Core b/Server/Plugins/Core
-Subproject 68430458a3ea695cac85bc82136941bc83253e1
+Subproject c0509526be5569bbc52bbcd3d64c256b834c451
diff --git a/Server/Plugins/ProtectionAreas b/Server/Plugins/ProtectionAreas
-Subproject 376b52df877f85c9d30c66eeb0a267cc956299b
+Subproject d08cf8fba9f700295ca0b54ee75aaec0b6b4b73