diff options
author | Mattes D <github@xoft.cz> | 2016-01-03 00:42:14 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2016-01-03 00:42:14 +0100 |
commit | c57bf8e538ddd8e6cc9f3a3aca071ec47e579839 (patch) | |
tree | 3cdffc73cd92af2d6833bf966adfcfd16d96c12d | |
parent | Merge pull request #2840 from cuberite/RenameToCuberite (diff) | |
parent | Fix typo (ammount) (diff) | |
download | cuberite-c57bf8e538ddd8e6cc9f3a3aca071ec47e579839.tar cuberite-c57bf8e538ddd8e6cc9f3a3aca071ec47e579839.tar.gz cuberite-c57bf8e538ddd8e6cc9f3a3aca071ec47e579839.tar.bz2 cuberite-c57bf8e538ddd8e6cc9f3a3aca071ec47e579839.tar.lz cuberite-c57bf8e538ddd8e6cc9f3a3aca071ec47e579839.tar.xz cuberite-c57bf8e538ddd8e6cc9f3a3aca071ec47e579839.tar.zst cuberite-c57bf8e538ddd8e6cc9f3a3aca071ec47e579839.zip |
-rw-r--r-- | Server/Plugins/APIDump/APIDesc.lua | 2 | ||||
-rw-r--r-- | src/Bindings/ManualBindings_World.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua index 503cc3a6c..6f3736bef 100644 --- a/Server/Plugins/APIDump/APIDesc.lua +++ b/Server/Plugins/APIDump/APIDesc.lua @@ -2432,7 +2432,7 @@ end BroadcastChatSuccess = { Params = "Message, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Prepends Green [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For success messages." }, BroadcastChatWarning = { Params = "Message, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Prepends Rose [WARN] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For concerning events, such as plugin reload etc." }, BroadcastEntityAnimation = { Params = "{{cEntity|TargetEntity}}, Animation, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Sends an animation of an entity to all clienthandles (except ExcludeClient if given)" }, - BroadcastParticleEffect = { Params = "ParticleName, X, Y, Z, OffSetX, OffSetY, OffSetZ, ParticleData, ParticleAmmount, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Spawns the specified particles to all players in the world exept the optional ExeptClient. A list of available particles by thinkofdeath can be found {{https://gist.github.com/thinkofdeath/5110835|Here}}" }, + BroadcastParticleEffect = { Params = "ParticleName, X, Y, Z, OffSetX, OffSetY, OffSetZ, ParticleData, ParticleAmount, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Spawns the specified particles to all players in the world exept the optional ExeptClient. A list of available particles by thinkofdeath can be found {{https://gist.github.com/thinkofdeath/5110835|Here}}" }, BroadcastSoundEffect = { Params = "SoundName, X, Y, Z, Volume, Pitch, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Sends the specified sound effect to all players in this world, except the optional ExceptClient" }, BroadcastSoundParticleEffect = { Params = "EffectID, X, Y, Z, EffectData, [{{cClientHandle|ExcludeClient}}]", Return = "", Notes = "Sends the specified effect to all players in this world, except the optional ExceptClient" }, CastThunderbolt = { Params = "X, Y, Z", Return = "", Notes = "Creates a thunderbolt at the specified coords" }, diff --git a/src/Bindings/ManualBindings_World.cpp b/src/Bindings/ManualBindings_World.cpp index 225e71af5..f40af9778 100644 --- a/src/Bindings/ManualBindings_World.cpp +++ b/src/Bindings/ManualBindings_World.cpp @@ -36,9 +36,9 @@ static int tolua_cWorld_BroadcastParticleEffect(lua_State * tolua_S) AString Name; float PosX, PosY, PosZ, OffX, OffY, OffZ; float ParticleData; - int ParticleAmmount; + int ParticleAmount; cClientHandle * ExcludeClient = nullptr; - L.GetStackValues(1, World, Name, PosX, PosY, PosZ, OffX, OffY, OffZ, ParticleData, ParticleAmmount, ExcludeClient); + L.GetStackValues(1, World, Name, PosX, PosY, PosZ, OffX, OffY, OffZ, ParticleData, ParticleAmount, ExcludeClient); if (World == nullptr) { LOGWARNING("World:BroadcastParticleEffect(): invalid world parameter"); @@ -53,7 +53,7 @@ static int tolua_cWorld_BroadcastParticleEffect(lua_State * tolua_S) L.GetStackValue(11 + i, data[static_cast<size_t>(i)]); } - World->GetBroadcaster().BroadcastParticleEffect(Name, Vector3f(PosX, PosY, PosZ), Vector3f(OffX, OffY, OffZ), ParticleData, ParticleAmmount, ExcludeClient); + World->GetBroadcaster().BroadcastParticleEffect(Name, Vector3f(PosX, PosY, PosZ), Vector3f(OffX, OffY, OffZ), ParticleData, ParticleAmount, ExcludeClient); return 0; } |