diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-03-15 14:53:07 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-03-15 14:53:07 +0100 |
| commit | 683e2f48405a2bcbf0b839db51379946e096b212 (patch) | |
| tree | 43f1df6cdfab7c6c440554438cd087fc3c19096e /src/Bindings | |
| parent | Merge branch 'master' into globals (diff) | |
| parent | Debuggers: Added a test for WE selection API. (diff) | |
| download | cuberite-683e2f48405a2bcbf0b839db51379946e096b212.tar cuberite-683e2f48405a2bcbf0b839db51379946e096b212.tar.gz cuberite-683e2f48405a2bcbf0b839db51379946e096b212.tar.bz2 cuberite-683e2f48405a2bcbf0b839db51379946e096b212.tar.lz cuberite-683e2f48405a2bcbf0b839db51379946e096b212.tar.xz cuberite-683e2f48405a2bcbf0b839db51379946e096b212.tar.zst cuberite-683e2f48405a2bcbf0b839db51379946e096b212.zip | |
Diffstat (limited to 'src/Bindings')
| -rw-r--r-- | src/Bindings/LuaState.h | 2 | ||||
| -rw-r--r-- | src/Bindings/PluginManager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h index 73f9629cb..f5cb8379d 100644 --- a/src/Bindings/LuaState.h +++ b/src/Bindings/LuaState.h @@ -200,7 +200,7 @@ public: void Push(const HTTPTemplateRequest * a_Request); void Push(cTNTEntity * a_TNTEntity); void Push(Vector3i * a_Vector); - void Push(void * a_Ptr); + NORETURNDEBUG void Push(void * a_Ptr); void Push(cHopperEntity * a_Hopper); void Push(cBlockEntity * a_BlockEntity); diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp index c7df6357e..b9cf160c4 100644 --- a/src/Bindings/PluginManager.cpp +++ b/src/Bindings/PluginManager.cpp @@ -248,7 +248,7 @@ bool cPluginManager::CallHookChat(cPlayer * a_Player, AString & a_Message) { AStringVector Split(StringSplit(a_Message, " ")); ASSERT(!Split.empty()); // This should not happen - we know there's at least one char in the message so the split needs to be at least one item long - a_Player->SendMessageInfo(Printf("Unknown command: \"%s\"", Split[0].c_str())); + a_Player->SendMessageInfo(Printf("Unknown command: \"%s\"", a_Message.c_str())); LOGINFO("Player %s issued an unknown command: \"%s\"", a_Player->GetName().c_str(), a_Message.c_str()); return true; // Cancel sending } |