diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-12-24 16:16:30 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-12-24 16:16:30 +0100 |
commit | ae6cb01e5666a8d4cedaf221f2e784f862784482 (patch) | |
tree | 0f688978194e4d3014b76d779c485f4de0de8ad3 | |
parent | Implemented stone and wooden pressure plates (diff) | |
download | cuberite-ae6cb01e5666a8d4cedaf221f2e784f862784482.tar cuberite-ae6cb01e5666a8d4cedaf221f2e784f862784482.tar.gz cuberite-ae6cb01e5666a8d4cedaf221f2e784f862784482.tar.bz2 cuberite-ae6cb01e5666a8d4cedaf221f2e784f862784482.tar.lz cuberite-ae6cb01e5666a8d4cedaf221f2e784f862784482.tar.xz cuberite-ae6cb01e5666a8d4cedaf221f2e784f862784482.tar.zst cuberite-ae6cb01e5666a8d4cedaf221f2e784f862784482.zip |
-rw-r--r-- | src/Entities/Player.cpp | 2 | ||||
-rw-r--r-- | src/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 26572f39b..6d199e130 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -457,7 +457,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround) TakeDamage(dtFalling, NULL, Damage, Damage, 0); } - // Apparently, Mojang changed player positions to always be rounded up. Normally, it doesn't affect much, but we need effect positions to be precise, so ceil() + // Mojang uses floor() to get X and Z positions, instead of just casting it to an (int) GetWorld()->BroadcastSoundParticleEffect(2006, (int)floor(GetPosX()), (int)GetPosY() - 1, (int)floor(GetPosZ()), Damage /* Used as particle effect speed modifier */); } diff --git a/src/main.cpp b/src/main.cpp index a4ee09952..81c6b41e4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -129,7 +129,7 @@ BOOL CtrlHandler(DWORD fdwCtrlType) g_TERMINATE_EVENT_RAISED = true; LOGD("Terminate event raised from the Windows CtrlHandler"); - if (fdwCtrlType == CTRL_CLOSE_EVENT) // Console windows closed via 'x' button, Windows will try to close immediately, therefore... + if (fdwCtrlType == CTRL_CLOSE_EVENT) // Console window closed via 'x' button, Windows will try to close immediately, therefore... { while (!g_SERVER_TERMINATED) { cSleep::MilliSleep(100); } // Delay as much as possible to try to get the server to shut down cleanly } |