mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-05-24 04:46:34 +00:00
chore: format Minecraft.Client
This commit is contained in:
Tropical
@@ -20,210 +20,212 @@
|
||||
#include "../../Minecraft.World/Util/BasicTypeContainers.h"
|
||||
#include "../Network/PlayerConnection.h"
|
||||
|
||||
EntityTracker::EntityTracker(ServerLevel *level)
|
||||
{
|
||||
EntityTracker::EntityTracker(ServerLevel* level) {
|
||||
this->level = level;
|
||||
maxRange = level->getServer()->getPlayers()->getMaxRange();
|
||||
}
|
||||
|
||||
void EntityTracker::addEntity(std::shared_ptr<Entity> e)
|
||||
{
|
||||
if (e->GetType() == eTYPE_SERVERPLAYER)
|
||||
{
|
||||
void EntityTracker::addEntity(std::shared_ptr<Entity> e) {
|
||||
if (e->GetType() == eTYPE_SERVERPLAYER) {
|
||||
addEntity(e, 32 * 16, 2);
|
||||
std::shared_ptr<ServerPlayer> player = std::dynamic_pointer_cast<ServerPlayer>(e);
|
||||
for( AUTO_VAR(it, entities.begin()); it != entities.end(); it++ )
|
||||
{
|
||||
if( (*it)->e != player )
|
||||
{
|
||||
(*it)->updatePlayer(this, player);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (e->GetType() == eTYPE_FISHINGHOOK) addEntity(e, 16 * 4, 5, true);
|
||||
else if (e->GetType() == eTYPE_SMALL_FIREBALL) addEntity(e, 16 * 4, 10, false);
|
||||
else if (e->GetType() == eTYPE_DRAGON_FIREBALL) addEntity(e, 16 * 4, 10, false); // 4J Added TU9
|
||||
else if (e->GetType() == eTYPE_ARROW) addEntity(e, 16 * 4, 20, false);
|
||||
else if (e->GetType() == eTYPE_FIREBALL) addEntity(e, 16 * 4, 10, false);
|
||||
else if (e->GetType() == eTYPE_SNOWBALL) addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_THROWNENDERPEARL) addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_EYEOFENDERSIGNAL ) addEntity(e, 16 * 4, 4, true);
|
||||
else if (e->GetType() == eTYPE_THROWNEGG) addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_THROWNPOTION ) addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_THROWNEXPBOTTLE) addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_ITEMENTITY) addEntity(e, 16 * 4, 20, true);
|
||||
else if (e->GetType() == eTYPE_MINECART) addEntity(e, 16 * 5, 3, true);
|
||||
else if (e->GetType() == eTYPE_BOAT) addEntity(e, 16 * 5, 3, true);
|
||||
else if (e->GetType() == eTYPE_SQUID) addEntity(e, 16 * 4, 3, true);
|
||||
else if (std::dynamic_pointer_cast<Creature>(e)!=NULL) addEntity(e, 16 * 5, 3, true);
|
||||
else if (e->GetType() == eTYPE_ENDERDRAGON ) addEntity(e, 16 * 10, 3, true);
|
||||
else if (e->GetType() == eTYPE_PRIMEDTNT) addEntity(e, 16 * 10, 10, true);
|
||||
else if (e->GetType() == eTYPE_FALLINGTILE) addEntity(e, 16 * 10, 20, true);
|
||||
else if (e->GetType() == eTYPE_PAINTING) addEntity(e, 16 * 10, INT_MAX, false);
|
||||
else if (e->GetType() == eTYPE_EXPERIENCEORB) addEntity(e, 16 * 10, 20, true);
|
||||
else if (e->GetType() == eTYPE_ENDER_CRYSTAL) addEntity(e, 16 * 16, INT_MAX, false);
|
||||
else if (e->GetType() == eTYPE_ITEM_FRAME) addEntity(e, 16 * 10, INT_MAX, false);
|
||||
std::shared_ptr<ServerPlayer> player =
|
||||
std::dynamic_pointer_cast<ServerPlayer>(e);
|
||||
for (AUTO_VAR(it, entities.begin()); it != entities.end(); it++) {
|
||||
if ((*it)->e != player) {
|
||||
(*it)->updatePlayer(this, player);
|
||||
}
|
||||
}
|
||||
} else if (e->GetType() == eTYPE_FISHINGHOOK)
|
||||
addEntity(e, 16 * 4, 5, true);
|
||||
else if (e->GetType() == eTYPE_SMALL_FIREBALL)
|
||||
addEntity(e, 16 * 4, 10, false);
|
||||
else if (e->GetType() == eTYPE_DRAGON_FIREBALL)
|
||||
addEntity(e, 16 * 4, 10, false); // 4J Added TU9
|
||||
else if (e->GetType() == eTYPE_ARROW)
|
||||
addEntity(e, 16 * 4, 20, false);
|
||||
else if (e->GetType() == eTYPE_FIREBALL)
|
||||
addEntity(e, 16 * 4, 10, false);
|
||||
else if (e->GetType() == eTYPE_SNOWBALL)
|
||||
addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_THROWNENDERPEARL)
|
||||
addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_EYEOFENDERSIGNAL)
|
||||
addEntity(e, 16 * 4, 4, true);
|
||||
else if (e->GetType() == eTYPE_THROWNEGG)
|
||||
addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_THROWNPOTION)
|
||||
addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_THROWNEXPBOTTLE)
|
||||
addEntity(e, 16 * 4, 10, true);
|
||||
else if (e->GetType() == eTYPE_ITEMENTITY)
|
||||
addEntity(e, 16 * 4, 20, true);
|
||||
else if (e->GetType() == eTYPE_MINECART)
|
||||
addEntity(e, 16 * 5, 3, true);
|
||||
else if (e->GetType() == eTYPE_BOAT)
|
||||
addEntity(e, 16 * 5, 3, true);
|
||||
else if (e->GetType() == eTYPE_SQUID)
|
||||
addEntity(e, 16 * 4, 3, true);
|
||||
else if (std::dynamic_pointer_cast<Creature>(e) != NULL)
|
||||
addEntity(e, 16 * 5, 3, true);
|
||||
else if (e->GetType() == eTYPE_ENDERDRAGON)
|
||||
addEntity(e, 16 * 10, 3, true);
|
||||
else if (e->GetType() == eTYPE_PRIMEDTNT)
|
||||
addEntity(e, 16 * 10, 10, true);
|
||||
else if (e->GetType() == eTYPE_FALLINGTILE)
|
||||
addEntity(e, 16 * 10, 20, true);
|
||||
else if (e->GetType() == eTYPE_PAINTING)
|
||||
addEntity(e, 16 * 10, INT_MAX, false);
|
||||
else if (e->GetType() == eTYPE_EXPERIENCEORB)
|
||||
addEntity(e, 16 * 10, 20, true);
|
||||
else if (e->GetType() == eTYPE_ENDER_CRYSTAL)
|
||||
addEntity(e, 16 * 16, INT_MAX, false);
|
||||
else if (e->GetType() == eTYPE_ITEM_FRAME)
|
||||
addEntity(e, 16 * 10, INT_MAX, false);
|
||||
}
|
||||
|
||||
void EntityTracker::addEntity(std::shared_ptr<Entity> e, int range, int updateInterval)
|
||||
{
|
||||
addEntity(e, range, updateInterval, false);
|
||||
void EntityTracker::addEntity(std::shared_ptr<Entity> e, int range,
|
||||
int updateInterval) {
|
||||
addEntity(e, range, updateInterval, false);
|
||||
}
|
||||
|
||||
void EntityTracker::addEntity(std::shared_ptr<Entity> e, int range, int updateInterval, bool trackDeltas)
|
||||
{
|
||||
void EntityTracker::addEntity(std::shared_ptr<Entity> e, int range,
|
||||
int updateInterval, bool trackDeltas) {
|
||||
if (range > maxRange) range = maxRange;
|
||||
if (entityMap.find(e->entityId) != entityMap.end())
|
||||
{
|
||||
assert(false); // Entity already tracked
|
||||
}
|
||||
if( e->entityId >= 2048 )
|
||||
{
|
||||
__debugbreak();
|
||||
}
|
||||
std::shared_ptr<TrackedEntity> te = std::shared_ptr<TrackedEntity>( new TrackedEntity(e, range, updateInterval, trackDeltas) );
|
||||
entities.insert(te);
|
||||
if (entityMap.find(e->entityId) != entityMap.end()) {
|
||||
assert(false); // Entity already tracked
|
||||
}
|
||||
if (e->entityId >= 2048) {
|
||||
__debugbreak();
|
||||
}
|
||||
std::shared_ptr<TrackedEntity> te = std::shared_ptr<TrackedEntity>(
|
||||
new TrackedEntity(e, range, updateInterval, trackDeltas));
|
||||
entities.insert(te);
|
||||
entityMap[e->entityId] = te;
|
||||
te->updatePlayers(this, &level->players);
|
||||
}
|
||||
|
||||
// 4J - have split removeEntity into two bits - it used to do the equivalent of EntityTracker::removePlayer followed by EntityTracker::removeEntity.
|
||||
// This is to allow us to now choose to remove the player as a "seenBy" only when the player has actually been removed from the level's own player array
|
||||
void EntityTracker::removeEntity(std::shared_ptr<Entity> e)
|
||||
{
|
||||
AUTO_VAR(it, entityMap.find(e->entityId));
|
||||
if( it != entityMap.end() )
|
||||
{
|
||||
std::shared_ptr<TrackedEntity> te = it->second;
|
||||
entityMap.erase(it);
|
||||
entities.erase(te);
|
||||
te->broadcastRemoved();
|
||||
}
|
||||
}
|
||||
|
||||
void EntityTracker::removePlayer(std::shared_ptr<Entity> e)
|
||||
{
|
||||
if (e->GetType() == eTYPE_SERVERPLAYER)
|
||||
{
|
||||
std::shared_ptr<ServerPlayer> player = std::dynamic_pointer_cast<ServerPlayer>(e);
|
||||
for( AUTO_VAR(it, entities.begin()); it != entities.end(); it++ )
|
||||
{
|
||||
(*it)->removePlayer(player);
|
||||
}
|
||||
// 4J - have split removeEntity into two bits - it used to do the equivalent of
|
||||
// EntityTracker::removePlayer followed by EntityTracker::removeEntity. This is
|
||||
// to allow us to now choose to remove the player as a "seenBy" only when the
|
||||
// player has actually been removed from the level's own player array
|
||||
void EntityTracker::removeEntity(std::shared_ptr<Entity> e) {
|
||||
AUTO_VAR(it, entityMap.find(e->entityId));
|
||||
if (it != entityMap.end()) {
|
||||
std::shared_ptr<TrackedEntity> te = it->second;
|
||||
entityMap.erase(it);
|
||||
entities.erase(te);
|
||||
te->broadcastRemoved();
|
||||
}
|
||||
}
|
||||
|
||||
void EntityTracker::tick()
|
||||
{
|
||||
std::vector<std::shared_ptr<ServerPlayer> > movedPlayers;
|
||||
for( AUTO_VAR(it, entities.begin()); it != entities.end(); it++ )
|
||||
{
|
||||
std::shared_ptr<TrackedEntity> te = *it;
|
||||
te->tick(this, &level->players);
|
||||
if (te->moved && te->e->GetType() == eTYPE_SERVERPLAYER)
|
||||
{
|
||||
movedPlayers.push_back(std::dynamic_pointer_cast<ServerPlayer>(te->e));
|
||||
void EntityTracker::removePlayer(std::shared_ptr<Entity> e) {
|
||||
if (e->GetType() == eTYPE_SERVERPLAYER) {
|
||||
std::shared_ptr<ServerPlayer> player =
|
||||
std::dynamic_pointer_cast<ServerPlayer>(e);
|
||||
for (AUTO_VAR(it, entities.begin()); it != entities.end(); it++) {
|
||||
(*it)->removePlayer(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 4J Stu - If one player on a system is updated, then make sure they all are as they all have their
|
||||
// range extended to include entities visible by any other player on the system
|
||||
// Fix for #11194 - Gameplay: Host player and their split-screen avatars can become invisible and invulnerable to client.
|
||||
MinecraftServer *server = MinecraftServer::getInstance();
|
||||
for( unsigned int i = 0; i < server->getPlayers()->players.size(); i++ )
|
||||
{
|
||||
std::shared_ptr<ServerPlayer> ep = server->getPlayers()->players[i];
|
||||
if( ep->dimension != level->dimension->id ) continue;
|
||||
void EntityTracker::tick() {
|
||||
std::vector<std::shared_ptr<ServerPlayer> > movedPlayers;
|
||||
for (AUTO_VAR(it, entities.begin()); it != entities.end(); it++) {
|
||||
std::shared_ptr<TrackedEntity> te = *it;
|
||||
te->tick(this, &level->players);
|
||||
if (te->moved && te->e->GetType() == eTYPE_SERVERPLAYER) {
|
||||
movedPlayers.push_back(
|
||||
std::dynamic_pointer_cast<ServerPlayer>(te->e));
|
||||
}
|
||||
}
|
||||
|
||||
if( ep->connection == NULL ) continue;
|
||||
INetworkPlayer *thisPlayer = ep->connection->getNetworkPlayer();
|
||||
if( thisPlayer == NULL ) continue;
|
||||
// 4J Stu - If one player on a system is updated, then make sure they all
|
||||
// are as they all have their range extended to include entities visible by
|
||||
// any other player on the system Fix for #11194 - Gameplay: Host player and
|
||||
// their split-screen avatars can become invisible and invulnerable to
|
||||
// client.
|
||||
MinecraftServer* server = MinecraftServer::getInstance();
|
||||
for (unsigned int i = 0; i < server->getPlayers()->players.size(); i++) {
|
||||
std::shared_ptr<ServerPlayer> ep = server->getPlayers()->players[i];
|
||||
if (ep->dimension != level->dimension->id) continue;
|
||||
|
||||
bool addPlayer = false;
|
||||
for (unsigned int j = 0; j < movedPlayers.size(); j++)
|
||||
{
|
||||
std::shared_ptr<ServerPlayer> sp = movedPlayers[j];
|
||||
if (ep->connection == NULL) continue;
|
||||
INetworkPlayer* thisPlayer = ep->connection->getNetworkPlayer();
|
||||
if (thisPlayer == NULL) continue;
|
||||
|
||||
if( sp == ep ) break;
|
||||
bool addPlayer = false;
|
||||
for (unsigned int j = 0; j < movedPlayers.size(); j++) {
|
||||
std::shared_ptr<ServerPlayer> sp = movedPlayers[j];
|
||||
|
||||
if(sp->connection == NULL) continue;
|
||||
INetworkPlayer *otherPlayer = sp->connection->getNetworkPlayer();
|
||||
if( otherPlayer != NULL && thisPlayer->IsSameSystem(otherPlayer) )
|
||||
{
|
||||
addPlayer = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( addPlayer ) movedPlayers.push_back( ep );
|
||||
}
|
||||
if (sp == ep) break;
|
||||
|
||||
for (unsigned int i = 0; i < movedPlayers.size(); i++)
|
||||
{
|
||||
if (sp->connection == NULL) continue;
|
||||
INetworkPlayer* otherPlayer = sp->connection->getNetworkPlayer();
|
||||
if (otherPlayer != NULL && thisPlayer->IsSameSystem(otherPlayer)) {
|
||||
addPlayer = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (addPlayer) movedPlayers.push_back(ep);
|
||||
}
|
||||
|
||||
for (unsigned int i = 0; i < movedPlayers.size(); i++) {
|
||||
std::shared_ptr<ServerPlayer> player = movedPlayers[i];
|
||||
if(player->connection == NULL) continue;
|
||||
for( AUTO_VAR(it, entities.begin()); it != entities.end(); it++ )
|
||||
{
|
||||
std::shared_ptr<TrackedEntity> te = *it;
|
||||
if (te->e != player)
|
||||
{
|
||||
if (player->connection == NULL) continue;
|
||||
for (AUTO_VAR(it, entities.begin()); it != entities.end(); it++) {
|
||||
std::shared_ptr<TrackedEntity> te = *it;
|
||||
if (te->e != player) {
|
||||
te->updatePlayer(this, player);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 4J Stu - We want to do this for dead players as they don't tick normally
|
||||
for(AUTO_VAR(it, level->players.begin()); it != level->players.end(); ++it)
|
||||
{
|
||||
std::shared_ptr<ServerPlayer> player = std::dynamic_pointer_cast<ServerPlayer>(*it);
|
||||
if(!player->isAlive())
|
||||
{
|
||||
player->flushEntitiesToRemove();
|
||||
}
|
||||
}
|
||||
// 4J Stu - We want to do this for dead players as they don't tick normally
|
||||
for (AUTO_VAR(it, level->players.begin()); it != level->players.end();
|
||||
++it) {
|
||||
std::shared_ptr<ServerPlayer> player =
|
||||
std::dynamic_pointer_cast<ServerPlayer>(*it);
|
||||
if (!player->isAlive()) {
|
||||
player->flushEntitiesToRemove();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EntityTracker::broadcast(std::shared_ptr<Entity> e, std::shared_ptr<Packet> packet)
|
||||
{
|
||||
AUTO_VAR(it, entityMap.find( e->entityId ));
|
||||
if( it != entityMap.end() )
|
||||
{
|
||||
std::shared_ptr<TrackedEntity> te = it->second;
|
||||
te->broadcast(packet);
|
||||
}
|
||||
void EntityTracker::broadcast(std::shared_ptr<Entity> e,
|
||||
std::shared_ptr<Packet> packet) {
|
||||
AUTO_VAR(it, entityMap.find(e->entityId));
|
||||
if (it != entityMap.end()) {
|
||||
std::shared_ptr<TrackedEntity> te = it->second;
|
||||
te->broadcast(packet);
|
||||
}
|
||||
}
|
||||
|
||||
void EntityTracker::broadcastAndSend(std::shared_ptr<Entity> e, std::shared_ptr<Packet> packet)
|
||||
{
|
||||
AUTO_VAR(it, entityMap.find( e->entityId ));
|
||||
if( it != entityMap.end() )
|
||||
{
|
||||
std::shared_ptr<TrackedEntity> te = it->second;
|
||||
te->broadcastAndSend(packet);
|
||||
}
|
||||
void EntityTracker::broadcastAndSend(std::shared_ptr<Entity> e,
|
||||
std::shared_ptr<Packet> packet) {
|
||||
AUTO_VAR(it, entityMap.find(e->entityId));
|
||||
if (it != entityMap.end()) {
|
||||
std::shared_ptr<TrackedEntity> te = it->second;
|
||||
te->broadcastAndSend(packet);
|
||||
}
|
||||
}
|
||||
|
||||
void EntityTracker::clear(std::shared_ptr<ServerPlayer> serverPlayer)
|
||||
{
|
||||
for( AUTO_VAR(it, entities.begin()); it != entities.end(); it++ )
|
||||
{
|
||||
std::shared_ptr<TrackedEntity> te = *it;
|
||||
te->clear(serverPlayer);
|
||||
}
|
||||
void EntityTracker::clear(std::shared_ptr<ServerPlayer> serverPlayer) {
|
||||
for (AUTO_VAR(it, entities.begin()); it != entities.end(); it++) {
|
||||
std::shared_ptr<TrackedEntity> te = *it;
|
||||
te->clear(serverPlayer);
|
||||
}
|
||||
}
|
||||
|
||||
// AP added for Vita so the range can be increased once the level starts
|
||||
void EntityTracker::updateMaxRange()
|
||||
{
|
||||
void EntityTracker::updateMaxRange() {
|
||||
maxRange = level->getServer()->getPlayers()->getMaxRange();
|
||||
}
|
||||
|
||||
|
||||
std::shared_ptr<TrackedEntity> EntityTracker::getTracker(std::shared_ptr<Entity> e)
|
||||
{
|
||||
AUTO_VAR(it, entityMap.find(e->entityId));
|
||||
if( it != entityMap.end() )
|
||||
{
|
||||
return it->second;
|
||||
}
|
||||
return nullptr;
|
||||
std::shared_ptr<TrackedEntity> EntityTracker::getTracker(
|
||||
std::shared_ptr<Entity> e) {
|
||||
AUTO_VAR(it, entityMap.find(e->entityId));
|
||||
if (it != entityMap.end()) {
|
||||
return it->second;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
Reference in New Issue
Block a user