Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Minecraft.World/Connection.cpp
View File

@@ -174,8 +174,10 @@ void Connection::send(shared_ptr<Packet> packet)
void Connection::queueSend(shared_ptr<Packet> packet)
{
if (quitting) return;
EnterCriticalSection(&writeLock);
estimatedRemaining += packet->getEstimatedSize() + 1;
outgoing_slow.push(packet);
LeaveCriticalSection(&writeLock);
}
bool Connection::writeTick()
@@ -204,8 +206,20 @@ bool Connection::writeTick()
#ifndef _CONTENT_PACKAGE
// 4J Added for debugging
int playerId = 0;
if( !socket->isLocal() )
Packet::recordOutgoingPacket(packet);
{
Socket *socket = getSocket();
if( socket )
{
INetworkPlayer *player = socket->getPlayer();
if( player )
{
playerId = player->GetSmallId();
}
}
Packet::recordOutgoingPacket(packet,playerId);
}
#endif
// 4J Stu - Changed this so that rather than writing to the network stream through a buffered stream we want to:
@@ -241,7 +255,11 @@ bool Connection::writeTick()
// 4J Stu - Changed this so that rather than writing to the network stream through a buffered stream we want to:
// a) Only push whole "game" packets to QNet, rather than amalgamated chunks of data that may include many packets, and partial packets
// b) To be able to change the priority and queue of a packet if required
#ifdef _XBOX
int flags = QNET_SENDDATA_LOW_PRIORITY | QNET_SENDDATA_SECONDARY;
#else
int flags = NON_QNET_SENDDATA_ACK_REQUIRED;
#endif
sos->writeWithFlags( baos->buf, 0, baos->size(), flags );
baos->reset();
}
@@ -253,7 +271,22 @@ bool Connection::writeTick()
#ifndef _CONTENT_PACKAGE
// 4J Added for debugging
if( !socket->isLocal() )
Packet::recordOutgoingPacket(packet);
{
int playerId = 0;
if( !socket->isLocal() )
{
Socket *socket = getSocket();
if( socket )
{
INetworkPlayer *player = socket->getPlayer();
if( player )
{
playerId = player->GetSmallId();
}
}
Packet::recordOutgoingPacket(packet,playerId);
}
}
#endif
writeSizes[packet->getId()] += packet->getEstimatedSize() + 1;