Compare commits
2 Commits
3ebed84cdb
...
d3d9b1a238
| Author | SHA1 | Date | |
|---|---|---|---|
| d3d9b1a238 | |||
| f0df3fe257 |
@@ -149,7 +149,6 @@ file(GLOB SERVER_SOURCES
|
|||||||
|
|
||||||
"src/platform/CThread.cpp"
|
"src/platform/CThread.cpp"
|
||||||
"src/platform/HttpClient.cpp"
|
"src/platform/HttpClient.cpp"
|
||||||
"src/platform/PngLoader.cpp"
|
|
||||||
"src/platform/time.cpp"
|
"src/platform/time.cpp"
|
||||||
|
|
||||||
"src/platform/input/Controller.cpp"
|
"src/platform/input/Controller.cpp"
|
||||||
@@ -302,18 +301,16 @@ if (${PLATFORM} STREQUAL "Desktop")
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Server
|
# Server
|
||||||
if(UNIX)
|
add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
|
||||||
add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
|
|
||||||
|
|
||||||
target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
|
target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
|
||||||
|
|
||||||
target_include_directories("${PROJECT_NAME}-server" PUBLIC
|
target_include_directories("${PROJECT_NAME}-server" PUBLIC
|
||||||
"${CMAKE_SOURCE_DIR}/src/"
|
"${CMAKE_SOURCE_DIR}/src/"
|
||||||
"project/lib_projects/raknet/jni/RaknetSources"
|
"project/lib_projects/raknet/jni/RaknetSources"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT})
|
target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT})
|
||||||
endif()
|
|
||||||
|
|
||||||
add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
|
add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
|
||||||
|
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ void NinecraftApp::teardown()
|
|||||||
Recipes ::teardownRecipes();
|
Recipes ::teardownRecipes();
|
||||||
TileEntity::teardownTileEntities();
|
TileEntity::teardownTileEntities();
|
||||||
#endif
|
#endif
|
||||||
#ifdef WIN32
|
#if defined(WIN32) && !defined(STANDALONE_SERVER)
|
||||||
ItemRenderer::teardown_static();
|
ItemRenderer::teardown_static();
|
||||||
if (EntityTileRenderer::instance != NULL) {
|
if (EntityTileRenderer::instance != NULL) {
|
||||||
delete EntityTileRenderer::instance;
|
delete EntityTileRenderer::instance;
|
||||||
|
|||||||
@@ -5,7 +5,9 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
#ifdef __linux__
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "world/level/LevelSettings.h"
|
#include "world/level/LevelSettings.h"
|
||||||
#include "world/level/Level.h"
|
#include "world/level/Level.h"
|
||||||
|
|||||||
@@ -433,24 +433,24 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
|
|||||||
{
|
{
|
||||||
if (!level) return;
|
if (!level) return;
|
||||||
|
|
||||||
//LOGI("MovePlayerPacket\n");
|
LOGI("MovePlayerPacket\n");
|
||||||
if (Entity* entity = level->getEntity(packet->entityId)) {
|
if (Entity* entity = level->getEntity(packet->entityId)) {
|
||||||
ServerPlayer* player = (ServerPlayer*) getPlayer(source);
|
ServerPlayer* player = (ServerPlayer*) getPlayer(source);
|
||||||
|
|
||||||
int timeElapsed = minecraft->getTicks() - player->getLastMoveTicks();
|
// int timeElapsed = minecraft->getTicks() - player->getLastMoveTicks();
|
||||||
|
|
||||||
if (timeElapsed > 0) {
|
// if (timeElapsed > 0) {
|
||||||
float dist = player->distanceTo(packet->x, player->y, packet->z);
|
// float dist = player->distanceTo(packet->x, player->y, packet->z);
|
||||||
float speed = dist / (minecraft->getTicks() - player->getLastMoveTicks());
|
// float speed = dist / (minecraft->getTicks() - player->getLastMoveTicks());
|
||||||
player->setLastMoveTicks(minecraft->getTicks());
|
// player->setLastMoveTicks(minecraft->getTicks());
|
||||||
|
|
||||||
float maxSpeed = (minecraft->isCreativeMode()) ? 1.65f : 1.f;
|
// float maxSpeed = (minecraft->isCreativeMode()) ? 1.65f : 1.f;
|
||||||
|
|
||||||
if (speed > maxSpeed) {
|
// if (speed > maxSpeed) {
|
||||||
MovePlayerPacket refuse(player->entityId, player->x, player->y, player->z, player->xRot, player->yRot);
|
// MovePlayerPacket refuse(player->entityId, player->x, player->y, player->z, player->xRot, player->yRot);
|
||||||
return raknetInstance->send(refuse);
|
// return raknetInstance->send(refuse);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
entity->xd = entity->yd = entity->zd = 0;
|
entity->xd = entity->yd = entity->zd = 0;
|
||||||
entity->lerpTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot, 3);
|
entity->lerpTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot, 3);
|
||||||
|
|||||||
Reference in New Issue
Block a user