diff options
Diffstat (limited to 'MCServer')
| -rw-r--r-- | MCServer/.gitignore | 3 | ||||
| -rw-r--r-- | MCServer/Plugins/APIDump/APIDesc.lua | 1 | ||||
| m--------- | MCServer/Plugins/Core | 0 | ||||
| m--------- | MCServer/Plugins/TransAPI | 6 |
4 files changed, 4 insertions, 6 deletions
diff --git a/MCServer/.gitignore b/MCServer/.gitignore index 1fed134fe..c18dd7a67 100644 --- a/MCServer/.gitignore +++ b/MCServer/.gitignore @@ -17,6 +17,9 @@ schematics *.pdb memdump* *.grab +Galleries.cfg +Galleries.example.cfg +Galleries.sqlite ProtectionAreas.sqlite helgrind.log valgrind.log diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua index a08f6f24b..75d5c011f 100644 --- a/MCServer/Plugins/APIDump/APIDesc.lua +++ b/MCServer/Plugins/APIDump/APIDesc.lua @@ -2077,6 +2077,7 @@ end { Params = "{{cItems|Pickups}}, X, Y, Z, SpeedX, SpeedY, SpeedZ", Return = "", Notes = "Spawns the specified pickups at the position specified. All the pickups fly away from the spawn position using the specified speed." }, }, SpawnMob = { Params = "X, Y, Z, {{cMonster|MonsterType}}", Return = "EntityID", Notes = "Spawns the specified type of mob at the specified coords. Returns the EntityID of the creates entity, or -1 on failure. " }, + SpawnFallingBlock = { Params = "X, Y, Z, BlockType, BlockMeta", Return = "EntityID", Notes = "Spawns an {{cFallingBlock|Falling Block}} entity at the specified coords with the given block type/meta" }, SpawnExperienceOrb = { Params = "X, Y, Z, Reward", Return = "EntityID", Notes = "Spawns an {{cExpOrb|experience orb}} at the specified coords, with the given reward" }, SpawnPrimedTNT = { Params = "X, Y, Z, FuseTimeSecs, InitialVelocityCoeff", Return = "", Notes = "Spawns a {{cTNTEntity|primed TNT entity}} at the specified coords, with the given fuse time. The entity gets a random speed multiplied by the InitialVelocityCoeff, 1 being the default value." }, TryGetHeight = { Params = "BlockX, BlockZ", Return = "IsValid, Height", Notes = "Returns true and height of the highest non-air block if the chunk is loaded, or false otherwise." }, diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core -Subproject de53a607f30c583e08c06b6e5eb936cd278ab8c +Subproject ede668bc7c310af49ad7354c00d3f11adbae792 diff --git a/MCServer/Plugins/TransAPI b/MCServer/Plugins/TransAPI -Subproject 52e1de4332a026e58fda843aae98c1f51e57199 +Subproject 6527b80a77b3b7f5fac0ef214c1b59ad83e39b2 |