TU46 Test content and patches

TU46 Test content, added missing commits by amending commit and cherry-picking to new branch, ready for iggy guis and tu46 bug fixes
This commit is contained in:
Tranqlmao authored and DrPerkyLegit committed 2026-10-22 13:55:39 -04:00
1 parent 8d6b69f599
commit ff562d1644
497 files changed
+11187 -771

No files matched your search

+21 -2
View File
@@ -1,4 +1,5 @@
#include "stdafx.h"
#include "../Minecraft.World/MoveVehiclePacket.h"
#include "PlayerConnection.h"
#include "ServerPlayer.h"
#include "ServerLevel.h"
@@ -242,6 +243,24 @@ void PlayerConnection::handlePlayerInput(shared_ptr<PlayerInputPacket> packet)
player->setPlayerInput(packet->getXxa(), packet->getYya(), packet->isJumping(), packet->isSneaking());
}
void PlayerConnection::handleMoveVehicle(shared_ptr<MoveVehiclePacket> packet)
{
shared_ptr<Entity> vehicle = player->riding;
if (vehicle == nullptr || !vehicle->instanceof(eTYPE_BOAT) || vehicle->rider.lock() != player) return;
double dx = packet->x - vehicle->x;
double dy = packet->y - vehicle->y;
double dz = packet->z - vehicle->z;
if (dx * dx + dy * dy + dz * dz - (vehicle->xd * vehicle->xd + vehicle->yd * vehicle->yd + vehicle->zd * vehicle->zd) > 100.0)
{
send(std::make_shared<MoveVehiclePacket>(vehicle->x, vehicle->y, vehicle->z, vehicle->yRot, vehicle->xRot));
return;
}
vehicle->absMoveTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot);
vehicle->positionRider(player);
}
void PlayerConnection::handleMovePlayer(shared_ptr<MovePlayerPacket> packet)
{
ServerLevel *level = server->getLevel(player->dimension);
@@ -267,7 +286,7 @@ void PlayerConnection::handleMovePlayer(shared_ptr<MovePlayerPacket> packet)
float yRotT = player->yRot;
float xRotT = player->xRot;
player->riding->positionRider();
player->riding->positionRider(player);
double xt = player->x;
double yt = player->y;
double zt = player->z;
@@ -283,7 +302,7 @@ void PlayerConnection::handleMovePlayer(shared_ptr<MovePlayerPacket> packet)
player->doTick(false);
player->ySlideOffset = 0;
player->absMoveTo(xt, yt, zt, yRotT, xRotT);
if (player->riding != nullptr) player->riding->positionRider();
if (player->riding != nullptr) player->riding->positionRider(player);
server->getPlayers()->move(player);
// player may have been kicked off the mount during the tick, so