mirror of
https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git
synced 2026-03-30 20:13:31 +00:00
Compare commits
2 Commits
ba3ed3b4dd
...
470c28d83a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
470c28d83a | ||
|
|
4363157cd9 |
@@ -1,33 +0,0 @@
|
|||||||
#include "NATPunchHandler.h"
|
|
||||||
#include "../raknet/TCPInterface.h"
|
|
||||||
#include "../raknet/HTTPConnection.h"
|
|
||||||
#include "PHPDirectoryServer2.h"
|
|
||||||
|
|
||||||
using namespace RakNet;
|
|
||||||
NATPuchHandler::NATPuchHandler() {
|
|
||||||
tcpInterface = new TCPInterface;
|
|
||||||
}
|
|
||||||
NATPuchHandler::~NATPuchHandler() {
|
|
||||||
delete tcpInterface;
|
|
||||||
}
|
|
||||||
|
|
||||||
void NATPuchHandler::initialize() {
|
|
||||||
tcpInterface->Start(0, 64);
|
|
||||||
}
|
|
||||||
|
|
||||||
void NATPuchHandler::registerToGameList(const RakNet::RakString& serverName, int port) {
|
|
||||||
HTTPConnection httpConnection;
|
|
||||||
httpConnection.Init(tcpInterface, "johanbernhardsson.se");
|
|
||||||
PHPDirectoryServer2 directoryServer;
|
|
||||||
directoryServer.Init(&httpConnection, "/DirectoryServer.php");
|
|
||||||
directoryServer.UploadTable("", serverName, port, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void NATPuchHandler::removeFromGameList() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void NATPuchHandler::close() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
#ifndef _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_
|
|
||||||
#define _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_
|
|
||||||
#include "../raknet/TCPInterface.h"
|
|
||||||
#include "../raknet/RakString.h"
|
|
||||||
class NATPuchHandler {
|
|
||||||
public:
|
|
||||||
enum NATPuchHandlerStatus {
|
|
||||||
NATPuchInitilized = 0,
|
|
||||||
NATPuchFetchingServerList = 1,
|
|
||||||
NATPuchConnecting = 2,
|
|
||||||
NATPuchConnected = 3,
|
|
||||||
NATPuchDissconnected = 4
|
|
||||||
};
|
|
||||||
NATPuchHandler();
|
|
||||||
~NATPuchHandler();
|
|
||||||
void initialize();
|
|
||||||
void registerToGameList(const RakNet::RakString& serverName, int port);
|
|
||||||
void removeFromGameList();
|
|
||||||
void close();
|
|
||||||
private:
|
|
||||||
RakNet::TCPInterface *tcpInterface;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_ */
|
|
||||||
@@ -7,6 +7,7 @@
|
|||||||
#include "../world/inventory/BaseContainerMenu.h"
|
#include "../world/inventory/BaseContainerMenu.h"
|
||||||
#include "network/packet/ContainerSetSlotPacket.h"
|
#include "network/packet/ContainerSetSlotPacket.h"
|
||||||
#include "network/packet/LoginStatusPacket.h"
|
#include "network/packet/LoginStatusPacket.h"
|
||||||
|
#include "network/packet/MovePlayerPacket.h"
|
||||||
#include "network/packet/RemoveBlockPacket.h"
|
#include "network/packet/RemoveBlockPacket.h"
|
||||||
#include "network/packet/SendInventoryPacket.h"
|
#include "network/packet/SendInventoryPacket.h"
|
||||||
#include "network/packet/UpdateBlockPacket.h"
|
#include "network/packet/UpdateBlockPacket.h"
|
||||||
@@ -411,23 +412,30 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
|
|||||||
{
|
{
|
||||||
ServerPlayer* player = (ServerPlayer*) getPlayer(source);
|
ServerPlayer* player = (ServerPlayer*) getPlayer(source);
|
||||||
|
|
||||||
// float vectorDist = sqrt( (packet->x - entity->x) * (packet->x - entity->x) +
|
float vectorDist = sqrt( (packet->x - entity->x) * (packet->x - entity->x) +
|
||||||
// (packet->y - entity->y) * (packet->y - entity->y) +
|
(packet->z - entity->z) * (packet->z - entity->z));
|
||||||
// (packet->z - entity->z) * (packet->z - entity->z));
|
float speed = vectorDist / (minecraft->getTicks() - player->getLastMoveTicks());
|
||||||
// float speed = vectorDist / (minecraft->getTicks() - player->getLastMoveTicks());
|
|
||||||
|
|
||||||
// TODO: Replace with Entity::move()
|
player->xRot = packet->xRot;
|
||||||
// if (speed < 2.5f) {
|
player->yRot = packet->yRot;
|
||||||
printf("Packet do: %f, %f, %f \n", packet->x, packet->y, packet->z);
|
|
||||||
printf("Entity do: %f, %f, %f \n", entity->x, entity->y, entity->z);
|
packet->y += 1.62f;
|
||||||
printf("Delta: %f %f %f \n", packet->x - entity->x, packet->y - entity->y, packet->z - entity->z);
|
|
||||||
|
if (speed < 2.5f) {
|
||||||
|
LOGI("Packet before: %f, %f, %f \n", packet->x, packet->y, packet->z);
|
||||||
|
LOGI("Entity before: %f, %f, %f \n", entity->x, entity->y, entity->z);
|
||||||
|
LOGI("Delta: %f %f %f \n", packet->x - entity->x, packet->y - entity->y, packet->z - entity->z);
|
||||||
player->xd = player->yd = player->zd = 0;
|
player->xd = player->yd = player->zd = 0;
|
||||||
player->move(packet->x - entity->x, packet->y - entity->y, packet->z - entity->z);
|
player->move(packet->x - entity->x, packet->y - entity->y, packet->z - entity->z);
|
||||||
printf("Entity after: %f, %f, %f \n", entity->x, entity->y, entity->z);
|
// player->travel(packet->x - entity->x, packet->z - entity->z);
|
||||||
|
LOGI("Entity after: %f, %f, %f \n", entity->x, entity->y, entity->z);
|
||||||
// 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);
|
||||||
// broadcast this packet to other clients
|
// broadcast this packet to other clients
|
||||||
redistributePacket(packet, source);
|
redistributePacket(packet, source);
|
||||||
//}
|
} else {
|
||||||
|
MovePlayerPacket refuse(player->entityId, player->x, player->y, player->z, player->xRot, player->yRot);
|
||||||
|
raknetInstance->send(refuse);
|
||||||
|
}
|
||||||
|
|
||||||
player->setLastMoveTicks(minecraft->getTicks());
|
player->setLastMoveTicks(minecraft->getTicks());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user