aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/PlayerList.cpp
blob: 645e3fb54fb4bb5a7c2103b6c04da1b525bbb9e3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
#include "stdafx.h"
#include "PlayerList.h"

#include <memory>
#include "PlayerChunkMap.h"
#include "MinecraftServer.h"
#include "Settings.h"
#include "ServerLevel.h"
#include "ServerChunkCache.h"
#include "ServerPlayer.h"
#include "ServerPlayerGameMode.h"
#include "ServerConnection.h"
#include "PendingConnection.h"
#include "PlayerConnection.h"
#include "EntityTracker.h"
#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
#include "..\Minecraft.World\ArrayWithLength.h"
#include "..\Minecraft.World\net.minecraft.network.packet.h"
#include "..\Minecraft.World\net.minecraft.network.h"
#include "Windows64\Windows64_Xuid.h"
#ifdef _WINDOWS64
#include "Windows64\Network\WinsockNetLayer.h"
#endif
#include "..\Minecraft.World\Pos.h"
#include "..\Minecraft.World\ProgressListener.h"
#include "..\Minecraft.World\HellRandomLevelSource.h"
#include "..\Minecraft.World\net.minecraft.world.phys.h"
#include "..\Minecraft.World\net.minecraft.world.item.h"
#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
#include "..\Minecraft.World\JavaMath.h"
#include "..\Minecraft.World\EntityIO.h"
#if defined(_XBOX) || defined(_WINDOWS64)
#include "Xbox\Network\NetworkPlayerXbox.h"
#elif defined(__PS3__) || defined(__ORBIS__)
#include "Common\Network\Sony\NetworkPlayerSony.h"
#endif

// 4J - this class is fairly substantially altered as there didn't seem any point in porting code for banning, whitelisting, ops etc.

PlayerList::PlayerList(MinecraftServer *server)
{
	playerIo = nullptr;

	this->server = server;

	sendAllPlayerInfoIn = 0;
	overrideGameMode = nullptr;
	allowCheatsForAllPlayers = false;

#ifdef __PSVITA__
	viewDistance = 3;
#elif defined _LARGE_WORLDS
	viewDistance = 16;
#else
	viewDistance = 10;
#endif

	//int viewDistance = server->settings->getInt(L"view-distance", 10);

	int rawMax = server->settings->getInt(L"max-players", 8);
	maxPlayers = static_cast<unsigned int>(Mth::clamp(rawMax, 1, MINECRAFT_NET_MAX_PLAYERS));
	doWhiteList = false;
	InitializeCriticalSection(&m_kickPlayersCS);
	InitializeCriticalSection(&m_closePlayersCS);
}

PlayerList::~PlayerList()
{
    for (auto& player : players)
    {
		player->connection = nullptr;	// Must remove reference to connection, or else there is a circular dependency
		delete player->gameMode;		// Gamemode also needs deleted as it references back to this player
		player->gameMode = nullptr;
	}

	DeleteCriticalSection(&m_kickPlayersCS);
	DeleteCriticalSection(&m_closePlayersCS);
}

bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer> player, shared_ptr<LoginPacket> packet)
{
	CompoundTag *playerTag = load(player);

	bool newPlayer = playerTag == nullptr;

	player->setLevel(server->getLevel(player->dimension));
	player->gameMode->setLevel(static_cast<ServerLevel *>(player->level));

	// Make sure these privileges are always turned off for the host player
	INetworkPlayer *networkPlayer = connection->getSocket()->getPlayer();
	if(networkPlayer != nullptr && networkPlayer->IsHost())
	{
		player->enableAllPlayerPrivileges(true);
		player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_HOST,1);
	}

#if defined(__PS3__) || defined(__ORBIS__)
	// PS3 networking library doesn't automatically assign PlayerUIDs to the network players for anything remote, so need to tell it what to set from the data in this packet now
	if( !g_NetworkManager.IsLocalGame() )
	{
		if( networkPlayer != nullptr )
		{
			((NetworkPlayerSony *)networkPlayer)->SetUID( packet->m_onlineXuid );
		}
	}
#endif
#ifdef _WINDOWS64
	if (networkPlayer != nullptr)
	{
		NetworkPlayerXbox* nxp = static_cast<NetworkPlayerXbox *>(networkPlayer);
		IQNetPlayer* qnp = nxp->GetQNetPlayer();
		if (qnp != nullptr)
		{
			if (!networkPlayer->IsLocal())
			{
				wcsncpy_s(qnp->m_gamertag, 32, player->name.c_str(), _TRUNCATE);
			}
			qnp->m_resolvedXuid = player->getXuid();
		}
	}
#endif
	// 4J Stu - TU-1 hotfix
	// Fix for #13150 - When a player loads/joins a game after saving/leaving in the nether, sometimes they are spawned on top of the nether and cannot mine down
	validatePlayerSpawnPosition(player);

	//        logger.info(getName() + " logged in with entity id " + playerEntity.entityId + " at (" + playerEntity.x + ", " + playerEntity.y + ", " + playerEntity.z + ")");

	ServerLevel *level = server->getLevel(player->dimension);

	DWORD playerIndex = (DWORD)MINECRAFT_NET_MAX_PLAYERS;
	{
		bool usedIndexes[MINECRAFT_NET_MAX_PLAYERS];
		ZeroMemory( &usedIndexes, MINECRAFT_NET_MAX_PLAYERS * sizeof(bool) );
        for (auto& p : players )
        {
			usedIndexes[p->getPlayerIndex()] = true;
		}
		for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
		{
			if(!usedIndexes[i])
			{
				playerIndex = i;
				break;
			}
		}
	}
	if (playerIndex >= static_cast<unsigned int>(MINECRAFT_NET_MAX_PLAYERS))
	{
		connection->send(std::make_shared<DisconnectPacket>(DisconnectPacket::eDisconnect_ServerFull));
		connection->sendAndQuit();
		return false;
	}
	player->setPlayerIndex( playerIndex );
	player->setCustomSkin( packet->m_playerSkinId );
	player->setCustomCape( packet->m_playerCapeId );

	// 4J-JEV: Moved this here so we can send player-model texture and geometry data.
	shared_ptr<PlayerConnection> playerConnection = std::make_shared<PlayerConnection>(server, connection, player);
	//player->connection = playerConnection;	// Used to be assigned in PlayerConnection ctor but moved out so we can use shared_ptr

	if(newPlayer)
	{
		int mapScale = 3;
#ifdef _LARGE_WORLDS
		int scale = MapItemSavedData::MAP_SIZE * 2 * (1 << mapScale);
		int centreXC = static_cast<int>(Math::round(player->x / scale) * scale);
		int centreZC = static_cast<int>(Math::round(player->z / scale) * scale);
#else
		// 4J-PB - for Xbox maps, we'll centre them on the origin of the world, since we can fit the whole world in our map
		int centreXC = 0;
		int centreZC = 0;
#endif
		// 4J Added - Give every player a map the first time they join a server
		player->inventory->setItem( 9, std::make_shared<ItemInstance>(Item::map_Id, 1, level->getAuxValueForMap(player->getXuid(), 0, centreXC, centreZC, mapScale)));
		if(app.getGameRuleDefinitions() != nullptr)
		{
			app.getGameRuleDefinitions()->postProcessPlayer(player);
		}
	}

	if(!player->customTextureUrl.empty() && player->customTextureUrl.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(player->customTextureUrl))
    {
        if (server->getConnection()->addPendingTextureRequest(player->customTextureUrl))
        {
#ifndef _CONTENT_PACKAGE
            wprintf(L"Sending texture packet to get custom skin %ls from player %ls\n", player->customTextureUrl.c_str(), player->name.c_str());
#endif
            playerConnection->send(std::make_shared<TextureAndGeometryPacket>(
                player->customTextureUrl,
				nullptr,
                static_cast<DWORD>(0)));

		}
	}
	else if(!player->customTextureUrl.empty() && app.IsFileInMemoryTextures(player->customTextureUrl))
	{
		// Update the ref count on the memory texture data
		app.AddMemoryTextureFile(player->customTextureUrl,nullptr,0);
	}

	if(!player->customTextureUrl2.empty() && player->customTextureUrl2.substr(0,3).compare(L"def") != 0 && !app.IsFileInMemoryTextures(player->customTextureUrl2))
	{
		if(	server->getConnection()->addPendingTextureRequest(player->customTextureUrl2))
		{
#ifndef _CONTENT_PACKAGE
			wprintf(L"Sending texture packet to get custom skin %ls from player %ls\n",player->customTextureUrl2.c_str(), player->name.c_str());
#endif
            playerConnection->send(std::make_shared<TexturePacket>(
                player->customTextureUrl,
                nullptr,
                static_cast<DWORD>(0)
                ));
		}
	}
	else if(!player->customTextureUrl2.empty() && app.IsFileInMemoryTextures(player->customTextureUrl2))
	{
		// Update the ref count on the memory texture data
		app.AddMemoryTextureFile(player->customTextureUrl2,nullptr,0);
	}

	player->setIsGuest( packet->m_isGuest );

	Pos *spawnPos = level->getSharedSpawnPos();

	updatePlayerGameMode(player, nullptr, level);

	// Update the privileges with the correct game mode
	GameType *gameType = Player::getPlayerGamePrivilege(player->getAllPlayerGamePrivileges(),Player::ePlayerGamePrivilege_CreativeMode) ? GameType::CREATIVE : GameType::SURVIVAL;
	gameType = LevelSettings::validateGameType(gameType->getId());
	if (player->gameMode->getGameModeForPlayer() != gameType)
	{
		player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_CreativeMode,player->gameMode->getGameModeForPlayer()->getId() );
	}

	//shared_ptr<PlayerConnection> playerConnection = shared_ptr<PlayerConnection>(new PlayerConnection(server, connection, player));
	player->connection = playerConnection;	// Used to be assigned in PlayerConnection ctor but moved out so we can use shared_ptr

	// 4J Added to store UGC settings
	playerConnection->m_friendsOnlyUGC = packet->m_friendsOnlyUGC;
	playerConnection->m_offlineXUID = packet->m_offlineXuid;
	playerConnection->m_onlineXUID = packet->m_onlineXuid;

	// This player is now added to the list, so incrementing this value invalidates all previous PreLogin packets
	if(packet->m_friendsOnlyUGC) ++server->m_ugcPlayersVersion;

	addPlayerToReceiving( player );

	int maxPlayersForPacket = getMaxPlayers() > 255 ? 255 : getMaxPlayers();

	BYTE newSmallId = 0;
	Socket *sock = connection->getSocket();
	INetworkPlayer *np = sock ? sock->getPlayer() : nullptr;
	if (np) newSmallId = np->GetSmallId();
	app.DebugPrintf("RECONNECT: placeNewPlayer smallId=%d entityId=%d dim=%d\n",
		newSmallId, player->entityId, level->dimension->id);

	playerConnection->send(std::make_shared<LoginPacket>(L"", player->entityId, level->getLevelData()->getGenerator(),
	                                                     level->getSeed(),
	                                                     player->gameMode->getGameModeForPlayer()->getId(),
	                                                     static_cast<byte>(level->dimension->id), static_cast<byte>(level->getMaxBuildHeight()),
	                                                     static_cast<byte>(maxPlayersForPacket),
	                                                     level->difficulty,
	                                                     TelemetryManager->GetMultiplayerInstanceID(),
	                                                     static_cast<BYTE>(playerIndex), level->useNewSeaLevel(),
	                                                     player->getAllPlayerGamePrivileges(),
	                                                     level->getLevelData()->getXZSize(),
	                                                     level->getLevelData()->getHellScale()));
	playerConnection->send(std::make_shared<SetSpawnPositionPacket>(spawnPos->x, spawnPos->y, spawnPos->z));
	playerConnection->send(std::make_shared<PlayerAbilitiesPacket>(&player->abilities));
	playerConnection->send(std::make_shared<SetCarriedItemPacket>(player->inventory->selected));
	delete spawnPos;

	updateEntireScoreboard(reinterpret_cast<ServerScoreboard *>(level->getScoreboard()), player);

	sendLevelInfo(player, level);

	// 4J-PB - removed, since it needs to be localised in the language the client is in
	//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"�e" + playerEntity->name + L" joined the game.") ) );
	broadcastAll(std::make_shared<ChatPacket>(player->name, ChatPacket::e_ChatPlayerJoinedGame));

	MemSect(14);
	add(player);
	MemSect(0);

	player->doTick(true, true, false);	// 4J - added - force sending of the nearest chunk before the player is teleported, so we have somewhere to arrive on...
	playerConnection->teleport(player->x, player->y, player->z, player->yRot, player->xRot);

	server->getConnection()->addPlayerConnection(playerConnection);
	playerConnection->send(std::make_shared<SetTimePacket>(level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)));

    auto activeEffects = player->getActiveEffects();
    for(MobEffectInstance *effect : *player->getActiveEffects())
	{
		playerConnection->send(std::make_shared<UpdateMobEffectPacket>(player->entityId, effect));
	}

	player->initMenu();

	if (playerTag != nullptr && playerTag->contains(Entity::RIDING_TAG))
	{
		// this player has been saved with a mount tag
		shared_ptr<Entity> mount = EntityIO::loadStatic(playerTag->getCompound(Entity::RIDING_TAG), level);
		if (mount != nullptr)
		{
			mount->forcedLoading = true;
			level->addEntity(mount);
			player->ride(mount);
			mount->forcedLoading = false;
		}
	}

	// If we are joining at the same time as someone in the end on this system is travelling through the win portal,
	// then we should set our wonGame flag to true so that respawning works when the EndPoem is closed
	INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();
	if( thisPlayer )
	{
		for(auto& servPlayer : players)
		{
			INetworkPlayer* checkPlayer = servPlayer->connection->getNetworkPlayer();
			if(thisPlayer != checkPlayer && checkPlayer && thisPlayer->IsSameSystem( checkPlayer ) && servPlayer->wonGame )
			{
				player->wonGame = true;
				break;
			}
		}
	}
	return true;
}

void PlayerList::updateEntireScoreboard(ServerScoreboard *scoreboard, shared_ptr<ServerPlayer> player)
{
	//unordered_set<Objective *> objectives;

	//for (PlayerTeam team : scoreboard->getPlayerTeams())
	//{
	//	player->connection->send( shared_ptr<SetPlayerTeamPacket>(new SetPlayerTeamPacket(team, SetPlayerTeamPacket::METHOD_ADD)));
	//}

	//for (int slot = 0; slot < Scoreboard::DISPLAY_SLOTS; slot++)
	//{
	//	Objective objective = scoreboard->getDisplayObjective(slot);

	//	if (objective != nullptr && !objectives->contains(objective))
	//	{
	//		vector<shared_ptr<Packet> > *packets = scoreboard->getStartTrackingPackets(objective);

	//		for (Packet packet : packets)
	//		{
	//			player->connection->send(packet);
	//		}

	//		objectives->add(objective);
	//	}
	//}
}

void PlayerList::setLevel(ServerLevelArray levels)
{
	playerIo = levels[0]->getLevelStorage()->getPlayerIO();
}

void PlayerList::changeDimension(shared_ptr<ServerPlayer> player, ServerLevel *from)
{
	ServerLevel *to = player->getLevel();

	if (from != nullptr) from->getChunkMap()->remove(player);
	to->getChunkMap()->add(player);

	to->cache->create(static_cast<int>(player->x) >> 4, static_cast<int>(player->z) >> 4);
}

int PlayerList::getMaxRange()
{
	return PlayerChunkMap::convertChunkRangeToBlock(getViewDistance());
}

CompoundTag *PlayerList::load(shared_ptr<ServerPlayer> player)
{
	return playerIo->load(player);
}

void PlayerList::save(shared_ptr<ServerPlayer> player)
{
	playerIo->save(player);
}

// 4J Stu - TU-1 hotifx
// Add this function to take some of the code from the PlayerList::add function with the fixes
// for checking spawn area, especially in the nether. These needed to be done in a different order from before
// Fix for #13150 - When a player loads/joins a game after saving/leaving in the nether, sometimes they are spawned on top of the nether and cannot mine down
void PlayerList::validatePlayerSpawnPosition(shared_ptr<ServerPlayer> player)
{
	// 4J Stu - Some adjustments to make sure the current players position is correct
	// Make sure that the player is on the ground, and in the centre x/z of the current column
	app.DebugPrintf("Original pos is %f, %f, %f in dimension %d\n", player->x, player->y, player->z, player->dimension);

	bool spawnForced = player->isRespawnForced();

	double targetX = 0;
	if(player->x < 0) targetX = Mth::ceil(player->x) - 0.5;
	else targetX = Mth::floor(player->x) + 0.5;

	double targetY = floor(player->y);

	double targetZ = 0;
	if(player->z < 0) targetZ = Mth::ceil(player->z) - 0.5;
	else targetZ = Mth::floor(player->z) + 0.5;

	player->setPos(targetX, targetY, targetZ);

	app.DebugPrintf("New pos is %f, %f, %f in dimension %d\n", player->x, player->y, player->z, player->dimension);

	ServerLevel *level = server->getLevel(player->dimension);
	while (level->getCubes(player, player->bb)->size() != 0)
	{
		player->setPos(player->x, player->y + 1, player->z);
	}
	app.DebugPrintf("Final pos is %f, %f, %f in dimension %d\n", player->x, player->y, player->z, player->dimension);

	// 4J Stu - If we are in the nether and the above while loop has put us above the nether then we have a problem
	// Finding a valid, safe spawn point is potentially computationally expensive (may have to hunt through a large part
	// of the nether) so move the player to their spawn position in the overworld so that they do not lose their inventory
	// 4J Stu - We also use this mechanism to force a spawn point in the overworld for players who were in the save when the reset nether option was applied
	if(level->dimension->id == -1 && player->y > 125)
	{
		app.DebugPrintf("Player in the nether tried to spawn at y = %f, moving to overworld\n", player->y);
		player->setLevel(server->getLevel(0));
		player->gameMode->setLevel(server->getLevel(0));
		player->dimension = 0;

		level = server->getLevel(player->dimension);

		Pos *levelSpawn = level->getSharedSpawnPos();
		player->setPos(levelSpawn->x, levelSpawn->y, levelSpawn->z);
		delete levelSpawn;

		Pos *bedPosition = player->getRespawnPosition();
		if (bedPosition != nullptr)
		{
			Pos *respawnPosition = Player::checkBedValidRespawnPosition(server->getLevel(player->dimension), bedPosition, spawnForced);
			if (respawnPosition != nullptr)
			{
				player->moveTo(respawnPosition->x + 0.5f, respawnPosition->y + 0.1f, respawnPosition->z + 0.5f, 0, 0);
				player->setRespawnPosition(bedPosition, spawnForced);
			}
			delete bedPosition;
		}
		while (level->getCubes(player, player->bb)->size() != 0)
		{
			player->setPos(player->x, player->y + 1, player->z);
		}

		app.DebugPrintf("Updated pos is %f, %f, %f in dimension %d\n", player->x, player->y, player->z, player->dimension);
	}
}

void PlayerList::add(shared_ptr<ServerPlayer> player)
{
	//broadcastAll(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket(player->name, true, 1000) ) );
	if( player->connection->getNetworkPlayer() )
	{
		broadcastAll(std::make_shared<PlayerInfoPacket>(player));
	}

	players.push_back(player);

	// 4J Added
	addPlayerToReceiving(player);

	// Ensure the area the player is spawning in is loaded!
	ServerLevel *level = server->getLevel(player->dimension);

	// 4J Stu - TU-1 hotfix
	// Fix for #13150 - When a player loads/joins a game after saving/leaving in the nether, sometimes they are spawned on top of the nether and cannot mine down
	// Some code from here has been moved to the above validatePlayerSpawnPosition function

	// 4J Stu - Swapped these lines about so that we get the chunk visiblity packet way ahead of all the add tracked entity packets
	// Fix for #9169 - ART : Sign text is replaced with the words �Awaiting approval�.
	changeDimension(player, nullptr);
	level->addEntity(player);

	for (size_t i = 0; i < players.size(); i++)
	{
		shared_ptr<ServerPlayer> op = players.at(i);
		//player->connection->send(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket(op->name, true, op->latency) ) );
		if( op->connection->getNetworkPlayer() )
		{
			player->connection->send(std::make_shared<PlayerInfoPacket>(op));
		}
	}

	if(level->isAtLeastOnePlayerSleeping())
	{
		shared_ptr<ServerPlayer> firstSleepingPlayer = nullptr;
		for (unsigned int i = 0; i < players.size(); i++)
		{
			shared_ptr<ServerPlayer> thisPlayer = players[i];
			if(thisPlayer->isSleeping())
			{
				if(firstSleepingPlayer == nullptr) firstSleepingPlayer = thisPlayer;
				thisPlayer->connection->send(std::make_shared<ChatPacket>(thisPlayer->name, ChatPacket::e_ChatBedMeSleep));
			}
		}
		player->connection->send(std::make_shared<ChatPacket>(firstSleepingPlayer->name, ChatPacket::e_ChatBedPlayerSleep));
	}
}

void PlayerList::move(shared_ptr<ServerPlayer> player)
{
	player->getLevel()->getChunkMap()->move(player);
}

void PlayerList::remove(shared_ptr<ServerPlayer> player)
{
	save(player);
	//4J Stu - We don't want to save the map data for guests, so when we are sure that the player is gone delete the map
	if(player->isGuest()) playerIo->deleteMapFilesForPlayer(player);
	ServerLevel *level = player->getLevel();
if (player->riding != nullptr)
	{
		level->removeEntityImmediately(player->riding);
		app.DebugPrintf("removing player mount");
	}
	level->getTracker()->removeEntity(player);
	level->removeEntity(player);
	level->getChunkMap()->remove(player);
    auto it = find(players.begin(), players.end(), player);
    if( it != players.end() )
	{
		players.erase(it);
	}
	//broadcastAll(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket(player->name, false, 9999) ) );

	removePlayerFromReceiving(player);
	player->connection = nullptr;		// Must remove reference to connection, or else there is a circular dependency
	delete player->gameMode;		// Gamemode also needs deleted as it references back to this player
	player->gameMode = nullptr;

	// 4J Stu - Save all the players currently in the game, which will also free up unused map id slots if required, and remove old players
	saveAll(nullptr,false);
}

shared_ptr<ServerPlayer> PlayerList::getPlayerForLogin(PendingConnection *pendingConnection, const wstring& userName, PlayerUID xuid, PlayerUID onlineXuid)
{
	if (players.size() >= (unsigned int)maxPlayers)
	{
		pendingConnection->disconnect(DisconnectPacket::eDisconnect_ServerFull);
		return shared_ptr<ServerPlayer>();
	}
	shared_ptr<ServerPlayer> player = std::make_shared<ServerPlayer>(server, server->getLevel(0), userName, new ServerPlayerGameMode(server->getLevel(0)));
	player->gameMode->player = player; // 4J added as had to remove this assignment from ServerPlayer ctor
	player->setXuid( xuid ); // 4J Added
	player->setOnlineXuid( onlineXuid ); // 4J Added
#ifdef _WINDOWS64
	{
		// Use packet-supplied identity from LoginPacket.
		// Do not recompute from name here: mixed-version clients must stay compatible.
		INetworkPlayer* np = pendingConnection->connection->getSocket()->getPlayer();
		if (np != nullptr)
		{
			player->setOnlineXuid(np->GetUID());

			// Backward compatibility: when Minecraft.Client is hosting, keep the first
			// host player on the legacy embedded host XUID (base + 0).
			// This preserves pre-migration host playerdata in existing worlds.
			if (np->IsHost())
			{
				player->setXuid(Win64Xuid::GetLegacyEmbeddedHostXuid());
			}
		}
	}
#endif
	// Work out the base server player settings
	INetworkPlayer *networkPlayer = pendingConnection->connection->getSocket()->getPlayer();
	if(networkPlayer != nullptr && !networkPlayer->IsHost())
	{
		player->enableAllPlayerPrivileges( app.GetGameHostOption(eGameHostOption_TrustPlayers)>0 );
	}

	// 4J Added
	LevelRuleset *serverRuleDefs = app.getGameRuleDefinitions();
	if(serverRuleDefs != nullptr)
	{
		player->gameMode->setGameRules( GameRuleDefinition::generateNewGameRulesInstance(GameRulesInstance::eGameRulesInstanceType_ServerPlayer, serverRuleDefs, pendingConnection->connection) );
	}

	return player;
}

shared_ptr<ServerPlayer> PlayerList::respawn(shared_ptr<ServerPlayer> serverPlayer, int targetDimension, bool keepAllPlayerData)
{
	// How we handle the entity tracker depends on whether we are the primary player currently, and whether there will be any player in the same system in the same dimension once we finish respawning.
	bool isPrimary = canReceiveAllPackets(serverPlayer);	// Is this the primary player in its current dimension?
	int oldDimension = serverPlayer->dimension;
	bool isEmptying = ( targetDimension != oldDimension);		// We're not emptying this dimension on this machine if this player is going back into the same dimension

	// Also consider if there is another player on this machine which is in the same dimension and can take over as primary player
	if( isEmptying )
	{
		INetworkPlayer *thisPlayer = serverPlayer->connection->getNetworkPlayer();

		for( unsigned int i = 0; i < players.size(); i++ )
		{
			shared_ptr<ServerPlayer> ep = players[i];
			if( ep == serverPlayer ) continue;
			if( ep->dimension !=  oldDimension ) continue;

			INetworkPlayer * otherPlayer = ep->connection->getNetworkPlayer();
			if( otherPlayer != nullptr && thisPlayer->IsSameSystem(otherPlayer) )
			{
				// There's another player here in the same dimension - we're not the last one out
				isEmptying = false;
			}
		}
	}

	// Now we know where we stand, the actions to take are as follows:
	// (1) if this isn't the primary player, then we just need to remove it from the entity tracker
	// (2) if this Is the primary player then:
	//		(a) if isEmptying is true, then remove the player from the tracker, and send "remove entity" packets for anything seen (this is the original behaviour of the code)
	//		(b) if isEmptying is false, then we'll be transferring control of entity tracking to another player

	if( isPrimary )
	{
		if( isEmptying )
		{
			app.DebugPrintf("Emptying this dimension\n");
			serverPlayer->getLevel()->getTracker()->clear(serverPlayer);
		}
		else
		{
			app.DebugPrintf("Transferring... storing flags\n");
			serverPlayer->getLevel()->getTracker()->removeEntity(serverPlayer);
		}
	}
	else
	{
		app.DebugPrintf("Not primary player\n");
		serverPlayer->getLevel()->getTracker()->removeEntity(serverPlayer);
	}

	serverPlayer->getLevel()->getChunkMap()->remove(serverPlayer);
    auto it = find(players.begin(), players.end(), serverPlayer);
    if( it != players.end() )
	{
		players.erase(it);
	}
	server->getLevel(serverPlayer->dimension)->removeEntityImmediately(serverPlayer);

	Pos *bedPosition = serverPlayer->getRespawnPosition();
	bool spawnForced = serverPlayer->isRespawnForced();

	removePlayerFromReceiving(serverPlayer);
	serverPlayer->dimension = targetDimension;

	EDefaultSkins skin = serverPlayer->getPlayerDefaultSkin();
	DWORD playerIndex = serverPlayer->getPlayerIndex();

	PlayerUID playerXuid = serverPlayer->getXuid();
	PlayerUID playerOnlineXuid = serverPlayer->getOnlineXuid();

	shared_ptr<ServerPlayer> player = std::make_shared<ServerPlayer>(server, server->getLevel(serverPlayer->dimension), serverPlayer->getName(), new ServerPlayerGameMode(server->getLevel(serverPlayer->dimension)));
	player->connection = serverPlayer->connection;
	player->restoreFrom(serverPlayer, keepAllPlayerData);
	if (keepAllPlayerData)
	{
		// Fix for #81759 - TU9: Content: Gameplay: Entering The End Exit Portal replaces the Player's currently held item with the first one from the Quickbar
		player->inventory->selected = serverPlayer->inventory->selected;
	}
	player->gameMode->player = player; // 4J added as had to remove this assignment from ServerPlayer ctor
	player->setXuid( playerXuid ); // 4J Added
	player->setOnlineXuid( playerOnlineXuid ); // 4J Added

	// 4J Stu - Don't reuse the id. If we do, then the player can be re-added after being removed, but the add packet gets sent before the remove packet
	//player->entityId = serverPlayer->entityId;

	player->setPlayerDefaultSkin( skin );
	player->setIsGuest( serverPlayer->isGuest() );
	player->setPlayerIndex( playerIndex );
	player->setCustomSkin( serverPlayer->getCustomSkin() );
	player->setCustomCape( serverPlayer->getCustomCape() );
	player->setPlayerGamePrivilege(Player::ePlayerGamePrivilege_All, serverPlayer->getAllPlayerGamePrivileges());
	player->gameMode->setGameRules( serverPlayer->gameMode->getGameRules() );
	player->dimension = targetDimension;

	// 4J Stu - Added this as we need to know earlier if the player is the player for this connection so that
	// we can work out if they are the primary for the system and can receive all packets
	player->connection->setPlayer( player );

	addPlayerToReceiving(player);

	ServerLevel *level = server->getLevel(serverPlayer->dimension);

	// reset the player's game mode (first pick from old, then copy level if
	// necessary)
	updatePlayerGameMode(player, serverPlayer, level);

	if(serverPlayer->wonGame && targetDimension == oldDimension && serverPlayer->getHealth() > 0)
	{
		// If the player is still alive and respawning to the same dimension, they are just being added back from someone else viewing the Win screen
		player->moveTo(serverPlayer->x, serverPlayer->y, serverPlayer->z, serverPlayer->yRot, serverPlayer->xRot);
		if(bedPosition != nullptr)
		{
			player->setRespawnPosition(bedPosition, spawnForced);
			delete bedPosition;
		}
		// Fix for #81759 - TU9: Content: Gameplay: Entering The End Exit Portal replaces the Player's currently held item with the first one from the Quickbar
		player->inventory->selected = serverPlayer->inventory->selected;
	}
	else if (bedPosition != nullptr)
	{
		Pos *respawnPosition = Player::checkBedValidRespawnPosition(server->getLevel(serverPlayer->dimension), bedPosition, spawnForced);
		if (respawnPosition != nullptr)
		{
			player->moveTo(respawnPosition->x + 0.5f, respawnPosition->y + 0.1f, respawnPosition->z + 0.5f, 0, 0);
			player->setRespawnPosition(bedPosition, spawnForced);
		}
		else
		{
			player->connection->send(std::make_shared<GameEventPacket>(GameEventPacket::NO_RESPAWN_BED_AVAILABLE, 0));
		}
		delete bedPosition;
	}

	// Ensure the area the player is spawning in is loaded!
	level->cache->create(static_cast<int>(player->x) >> 4, static_cast<int>(player->z) >> 4);

	while (!level->getCubes(player, player->bb)->empty())
	{
		player->setPos(player->x, player->y + 1, player->z);
	}

	player->connection->send( std::make_shared<RespawnPacket>( static_cast<char>(player->dimension), player->level->getSeed(), player->level->getMaxBuildHeight(),
		player->gameMode->getGameModeForPlayer(), level->difficulty, level->getLevelData()->getGenerator(),
		player->level->useNewSeaLevel(), player->entityId, level->getLevelData()->getXZSize(), level->getLevelData()->getHellScale() ) );
	player->connection->teleport(player->x, player->y, player->z, player->yRot, player->xRot);
	player->connection->send( std::make_shared<SetExperiencePacket>( player->experienceProgress, player->totalExperience, player->experienceLevel) );

	if(keepAllPlayerData)
	{
		vector<MobEffectInstance *> *activeEffects = player->getActiveEffects();
		for(MobEffectInstance *effect : *activeEffects)
		{
			player->connection->send(std::make_shared<UpdateMobEffectPacket>( player->entityId, effect ) );
		}
		delete activeEffects;
		player->getEntityData()->markDirty(Mob::DATA_EFFECT_COLOR_ID);
	}

	sendLevelInfo(player, level);

	level->getChunkMap()->add(player);
	level->addEntity(player);
	players.push_back(player);

	player->initMenu();
	player->setHealth(player->getHealth());

	// 4J-JEV - Dying before this point in the tutorial is pretty annoying,
	// making sure to remove health/hunger and give you back your meat.
	if( Minecraft::GetInstance()->isTutorial()
		&& (!Minecraft::GetInstance()->gameMode->getTutorial()->isStateCompleted(e_Tutorial_State_Food_Bar)) )
	{
		app.getGameRuleDefinitions()->postProcessPlayer(player);
	}

	if( oldDimension == 1 && player->dimension != 1 )
	{
		player->displayClientMessage(IDS_PLAYER_LEFT_END);
	}

	return player;

}

void PlayerList::toggleDimension(shared_ptr<ServerPlayer> player, int targetDimension)
{
	int lastDimension = player->dimension;
	// How we handle the entity tracker depends on whether we are the primary player currently, and whether there will be any player in the same system in the same dimension once we finish respawning.
	bool isPrimary = canReceiveAllPackets(player);	// Is this the primary player in its current dimension?
	bool isEmptying = true;

	// Also consider if there is another player on this machine which is in the same dimension and can take over as primary player
	INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();

	for( unsigned int i = 0; i < players.size(); i++ )
	{
		shared_ptr<ServerPlayer> ep = players[i];
		if( ep == player ) continue;
		if( ep->dimension !=  lastDimension ) continue;

		INetworkPlayer * otherPlayer = ep->connection->getNetworkPlayer();
		if( otherPlayer != nullptr && thisPlayer->IsSameSystem(otherPlayer) )
		{
			// There's another player here in the same dimension - we're not the last one out
			isEmptying = false;
		}
	}


	// Now we know where we stand, the actions to take are as follows:
	// (1) if this isn't the primary player, then we just need to remove it from the entity tracker
	// (2) if this Is the primary player then:
	//		(a) if isEmptying is true, then remove the player from the tracker, and send "remove entity" packets for anything seen (this is the original behaviour of the code)
	//		(b) if isEmptying is false, then we'll be transferring control of entity tracking to another player

	if( isPrimary )
	{
		if( isEmptying )
		{
			app.DebugPrintf("Toggle... Emptying this dimension\n");
			player->getLevel()->getTracker()->clear(player);
		}
		else
		{
			app.DebugPrintf("Toggle...  transferring\n");
			player->getLevel()->getTracker()->removeEntity(player);
		}
	}
	else
	{
		app.DebugPrintf("Toggle...  Not primary player\n");
		player->getLevel()->getTracker()->removeEntity(player);
	}

	ServerLevel *oldLevel = server->getLevel(player->dimension);

	// 4J Stu - Do this much earlier so we don't end up unloading chunks in the wrong dimension
	player->getLevel()->getChunkMap()->remove(player);

	if(player->dimension != 1 && targetDimension == 1)
	{
		player->displayClientMessage(IDS_PLAYER_ENTERED_END);
	}
	else if( player->dimension == 1 )
	{
		player->displayClientMessage(IDS_PLAYER_LEFT_END);
	}

	player->dimension = targetDimension;

	ServerLevel *newLevel = server->getLevel(player->dimension);

	// 4J Stu - Fix for #46423 - TU5: Art: Code: No burning animation visible after entering The Nether while burning
	player->clearFire(); // Stop burning if travelling through a portal

	// 4J Stu Added so that we remove entities from the correct level, after the respawn packet we will be in the wrong level
	player->flushEntitiesToRemove();

	player->connection->send(std::make_shared<RespawnPacket>(static_cast<char>(player->dimension), newLevel->getSeed(), newLevel->getMaxBuildHeight(),
                                                             player->gameMode->getGameModeForPlayer(), newLevel->difficulty, newLevel->getLevelData()->getGenerator(),
                                                             newLevel->useNewSeaLevel(), player->entityId, newLevel->getLevelData()->getXZSize(), newLevel->getLevelData()->getHellScale()));

	oldLevel->removeEntityImmediately(player);
	player->removed = false;

	repositionAcrossDimension(player, lastDimension, oldLevel, newLevel);
	changeDimension(player, oldLevel);

	player->gameMode->setLevel(newLevel);

	// Resend the teleport if we haven't yet sent the chunk they will land on
	if( !g_NetworkManager.SystemFlagGet(player->connection->getNetworkPlayer(),ServerPlayer::getFlagIndexForChunk( ChunkPos(player->xChunk,player->zChunk), player->level->dimension->id ) ) )
	{
		player->connection->teleport(player->x, player->y, player->z, player->yRot, player->xRot, false);
		// Force sending of the current chunk
		player->doTick(true, true, true);
	}

	player->connection->teleport(player->x, player->y, player->z, player->yRot, player->xRot);

	// 4J Stu - Fix for #64683 - Customer Encountered: TU7: Content: Gameplay: Potion effects are removed after using the Nether Portal
	vector<MobEffectInstance *> *activeEffects = player->getActiveEffects();
	for(MobEffectInstance *effect : *activeEffects)
	{
		player->connection->send(std::make_shared<UpdateMobEffectPacket>( player->entityId, effect ) );
	}
	delete activeEffects;
	player->getEntityData()->markDirty(Mob::DATA_EFFECT_COLOR_ID);

	sendLevelInfo(player, newLevel);
	sendAllPlayerInfo(player);
}

void PlayerList::repositionAcrossDimension(shared_ptr<Entity> entity, int lastDimension, ServerLevel *oldLevel, ServerLevel *newLevel)
{
	double xt = entity->x;
	double zt = entity->z;
	double xOriginal = entity->x;
	double yOriginal = entity->y;
	double zOriginal = entity->z;
	float yRotOriginal = entity->yRot;
	double scale = newLevel->getLevelData()->getHellScale(); // 4J Scale was 8 but this is all we can fit in
	if (entity->dimension == -1)
	{
		xt /= scale;
		zt /= scale;
		entity->moveTo(xt, entity->y, zt, entity->yRot, entity->xRot);
		if (entity->isAlive())
		{
			oldLevel->tick(entity, false);
		}
	}
	else if (entity->dimension == 0)
	{
		xt *= scale;
		zt *= scale;
		entity->moveTo(xt, entity->y, zt, entity->yRot, entity->xRot);
		if (entity->isAlive())
		{
			oldLevel->tick(entity, false);
		}
	}
	else
	{
		Pos *p;

		if (lastDimension == 1)
		{
			// Coming from the end
			p = newLevel->getSharedSpawnPos();
		}
		else
		{
			// Going to the end
			p = newLevel->getDimensionSpecificSpawn();
		}

		xt = p->x;
		entity->y = p->y;
		zt = p->z;
		delete p;
		entity->moveTo(xt, entity->y, zt, 90, 0);
		if (entity->isAlive())
		{
			oldLevel->tick(entity, false);
		}
	}

	if(entity->GetType() == eTYPE_SERVERPLAYER)
	{
		shared_ptr<ServerPlayer> player = dynamic_pointer_cast<ServerPlayer>(entity);
		removePlayerFromReceiving(player, false, lastDimension);
		addPlayerToReceiving(player);
	}

	if (lastDimension != 1)
	{
		xt = static_cast<double>(Mth::clamp(static_cast<int>(xt), -Level::MAX_LEVEL_SIZE + 128, Level::MAX_LEVEL_SIZE - 128));
		zt = static_cast<double>(Mth::clamp(static_cast<int>(zt), -Level::MAX_LEVEL_SIZE + 128, Level::MAX_LEVEL_SIZE - 128));
		if (entity->isAlive())
		{
			newLevel->addEntity(entity);
			entity->moveTo(xt, entity->y, zt, entity->yRot, entity->xRot);
			newLevel->tick(entity, false);
			newLevel->cache->autoCreate = true;
			newLevel->getPortalForcer()->force(entity, xOriginal, yOriginal, zOriginal, yRotOriginal);
			newLevel->cache->autoCreate = false;
		}
	}

	entity->setLevel(newLevel);
}

void PlayerList::tick()
{
	// 4J - brought changes to how often this is sent forward from 1.2.3
	if (++sendAllPlayerInfoIn > SEND_PLAYER_INFO_INTERVAL)
	{
		sendAllPlayerInfoIn = 0;
	}

	if (sendAllPlayerInfoIn < players.size())
	{
		shared_ptr<ServerPlayer> op = players[sendAllPlayerInfoIn];
		//broadcastAll(shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket(op->name, true, op->latency) ) );
		if( op->connection->getNetworkPlayer() )
		{
			broadcastAll(std::make_shared<PlayerInfoPacket>(op));
		}
	}

	EnterCriticalSection(&m_closePlayersCS);
	while(!m_smallIdsToClose.empty())
	{
		BYTE smallId = m_smallIdsToClose.front();
		m_smallIdsToClose.pop_front();

		shared_ptr<ServerPlayer> player = nullptr;

		for(unsigned int i = 0; i < players.size(); i++)
		{
			shared_ptr<ServerPlayer> p = players.at(i);
			// 4J Stu - May be being a bit overprotective with all the nullptr checks, but adding late in TU7 so want to be safe
			if (p != nullptr && p->connection != nullptr && p->connection->connection != nullptr && p->connection->connection->getSocket() != nullptr && p->connection->connection->getSocket()->getSmallId() == smallId )
			{
				player = p;
				break;
			}
		}

		if (player != nullptr)
		{
			player->connection->disconnect( DisconnectPacket::eDisconnect_Closed );
		}

#ifdef _WINDOWS64
		// The old Connection's read/write threads are now dead (disconnect waits
		// for them). Safe to recycle the smallId — no stale write thread can
		// resolve getPlayer() to a new connection that reuses this slot.
		WinsockNetLayer::PushFreeSmallId(smallId);
		WinsockNetLayer::ClearSocketForSmallId(smallId);
#endif
	}
	LeaveCriticalSection(&m_closePlayersCS);

	EnterCriticalSection(&m_kickPlayersCS);
	while(!m_smallIdsToKick.empty())
	{
		BYTE smallId = m_smallIdsToKick.front();
		m_smallIdsToKick.pop_front();
		INetworkPlayer *selectedPlayer = g_NetworkManager.GetPlayerBySmallId(smallId);
		if( selectedPlayer != nullptr )
		{
			if( selectedPlayer->IsLocal() != TRUE )
			{
				//#ifdef _XBOX
				PlayerUID xuid = selectedPlayer->GetUID();
				// Kick this player from the game
				shared_ptr<ServerPlayer> player = nullptr;

				for(unsigned int i = 0; i < players.size(); i++)
				{
					shared_ptr<ServerPlayer> p = players.at(i);
					PlayerUID playersXuid = p->getOnlineXuid();
					if (p != nullptr && ProfileManager.AreXUIDSEqual(playersXuid, xuid ) )
					{
						player = p;
						break;
					}
				}

				if (player != nullptr)
				{
					m_bannedXuids.push_back( player->getOnlineXuid() );
					// 4J Stu - If we have kicked a player, make sure that they have no privileges if they later try to join the world when trust players is off
					player->enableAllPlayerPrivileges( false );
					player->connection->setWasKicked();
					player->connection->send(std::make_shared<DisconnectPacket>(DisconnectPacket::eDisconnect_Kicked));
				}
				//#endif
			}
		}
	}
	LeaveCriticalSection(&m_kickPlayersCS);

	// Check our receiving players, and if they are dead see if we can replace them
	for(unsigned int dim = 0; dim < 2; ++dim)
	{
		for(unsigned int i = 0; i < receiveAllPlayers[dim].size(); ++i)
		{
			shared_ptr<ServerPlayer> currentPlayer  = receiveAllPlayers[dim][i];
			if(currentPlayer->removed)
			{
				shared_ptr<ServerPlayer> newPlayer = findAlivePlayerOnSystem(currentPlayer);
				if(newPlayer != nullptr)
				{
					receiveAllPlayers[dim][i] = newPlayer;
					app.DebugPrintf("Replacing primary player %ls with %ls in dimension %d\n", currentPlayer->name.c_str(), newPlayer->name.c_str(), dim);
				}
			}
		}
	}
}

bool PlayerList::isTrackingTile(int x, int y, int z, int dimension)
{
	return server->getLevel(dimension)->getChunkMap()->isTrackingTile(x, y, z);
}

// 4J added - make sure that any tile updates for the chunk at this location get prioritised for sending
void PlayerList::prioritiseTileChanges(int x, int y, int z, int dimension)
{
	server->getLevel(dimension)->getChunkMap()->prioritiseTileChanges(x, y, z);
}

void PlayerList::broadcastAll(shared_ptr<Packet> packet)
{
	for (unsigned int i = 0; i < players.size(); i++)
	{
		shared_ptr<ServerPlayer> player = players[i];
		player->connection->send(packet);
	}
}

void PlayerList::broadcastAll(shared_ptr<Packet> packet, int dimension)
{
	for (unsigned int i = 0; i < players.size(); i++)
	{
		shared_ptr<ServerPlayer> player = players[i];
		if (player->dimension == dimension) player->connection->send(packet);
	}
}

wstring PlayerList::getPlayerNames()
{
	wstring msg;
	for (unsigned int i = 0; i < players.size(); i++)
	{
		if (i > 0) msg += L", ";
		msg += players[i]->name;
	}
	return msg;
}

bool PlayerList::isWhiteListed(const wstring& name)
{
	return true;
}

bool PlayerList::isOp(const wstring& name)
{
	return false;
}

bool PlayerList::isOp(shared_ptr<ServerPlayer> player)
{
	bool cheatsEnabled = app.GetGameHostOption(eGameHostOption_CheatsEnabled);
#ifdef _DEBUG_MENUS_ENABLED
	cheatsEnabled = cheatsEnabled || app.GetUseDPadForDebug();
#endif
	INetworkPlayer *networkPlayer = player->connection->getNetworkPlayer();
	bool isOp = cheatsEnabled && (player->isModerator() || (networkPlayer != nullptr && networkPlayer->IsHost()));
	return isOp;
}

shared_ptr<ServerPlayer> PlayerList::getPlayer(const wstring& name)
{
	for (unsigned int i = 0; i < players.size(); i++)
	{
		shared_ptr<ServerPlayer> p = players[i];
		if (p->name == name)	// 4J - used to be case insensitive (using equalsIgnoreCase) - imagine we'll be shifting to XUIDs anyway
		{
			return p;
		}
	}
	return nullptr;
}

// 4J Added
shared_ptr<ServerPlayer> PlayerList::getPlayer(PlayerUID uid)
{
	for (unsigned int i = 0; i < players.size(); i++)
	{
		shared_ptr<ServerPlayer> p = players[i];
		if (p->getXuid() == uid || p->getOnlineXuid() == uid)	// 4J - used to be case insensitive (using equalsIgnoreCase) - imagine we'll be shifting to XUIDs anyway
		{
			return p;
		}
	}
	return nullptr;
}

shared_ptr<ServerPlayer> PlayerList::getNearestPlayer(Pos *position, int range)
{
	if (players.empty()) return nullptr;
	if (position == nullptr) return players.at(0);
	shared_ptr<ServerPlayer> current = nullptr;
	double dist = -1;
	int rangeSqr = range * range;

	for (size_t i = 0; i < players.size(); i++)
	{
		shared_ptr<ServerPlayer> next = players.at(i);
		double newDist = position->distSqr(next->getCommandSenderWorldPosition());

		if ((dist == -1 || newDist < dist) && (range <= 0 || newDist <= rangeSqr))
		{
			dist = newDist;
			current = next;
		}
	}

	return current;
}

vector<ServerPlayer> *PlayerList::getPlayers(Pos *position, int rangeMin, int rangeMax, int count, int mode, int levelMin, int levelMax, unordered_map<wstring, int> *scoreRequirements, const wstring &playerName,	const wstring &teamName, Level *level)
{
	app.DebugPrintf("getPlayers NOT IMPLEMENTED!");
	return nullptr;

	/*if (players.empty()) return nullptr;
	vector<shared_ptr<ServerPlayer> > result = new vector<shared_ptr<ServerPlayer> >();
	bool reverse = count < 0;
	bool playerNameNot = !playerName.empty() && playerName.startsWith("!");
	bool teamNameNot = !teamName.empty() && teamName.startsWith("!");
	int rangeMinSqr = rangeMin * rangeMin;
	int rangeMaxSqr = rangeMax * rangeMax;
	count = Mth.abs(count);

	if (playerNameNot) playerName = playerName.substring(1);
	if (teamNameNot) teamName = teamName.substring(1);

	for (size_t i = 0; i < players.size(); i++) {
	ServerPlayer player = players.get(i);

	if (level != null && player.level != level) continue;
	if (playerName != null) {
	if (playerNameNot == playerName.equalsIgnoreCase(player.getAName())) continue;
	}
	if (teamName != null) {
	Team team = player.getTeam();
	String actualName = team == null ? "" : team.getName();
	if (teamNameNot == teamName.equalsIgnoreCase(actualName)) continue;
	}

	if (position != null && (rangeMin > 0 || rangeMax > 0)) {
	float distance = position.distSqr(player.getCommandSenderWorldPosition());
	if (rangeMin > 0 && distance < rangeMinSqr) continue;
	if (rangeMax > 0 && distance > rangeMaxSqr) continue;
	}

	if (!meetsScoreRequirements(player, scoreRequirements)) continue;

	if (mode != GameType.NOT_SET.getId() && mode != player.gameMode.getGameModeForPlayer().getId()) continue;
	if (levelMin > 0 && player.experienceLevel < levelMin) continue;
	if (player.experienceLevel > levelMax) continue;

	result.add(player);
	}

	if (position != null) Collections.sort(result, new PlayerDistanceComparator(position));
	if (reverse) Collections.reverse(result);
	if (count > 0) result = result.subList(0, Math.min(count, result.size()));

	return result;*/
}

bool PlayerList::meetsScoreRequirements(shared_ptr<Player> player, unordered_map<wstring, int> scoreRequirements)
{
	app.DebugPrintf("meetsScoreRequirements NOT IMPLEMENTED!");
	return false;

	//if (scoreRequirements == null || scoreRequirements.size() == 0) return true;

	//for (Map.Entry<String, Integer> requirement : scoreRequirements.entrySet()) {
	//	String name = requirement.getKey();
	//	boolean min = false;

	//	if (name.endsWith("_min") && name.length() > 4) {
	//		min = true;
	//		name = name.substring(0, name.length() - 4);
	//	}

	//	Scoreboard scoreboard = player.getScoreboard();
	//	Objective objective = scoreboard.getObjective(name);
	//	if (objective == null) return false;
	//	Score score = player.getScoreboard().getPlayerScore(player.getAName(), objective);
	//	int value = score.getScore();

	//	if (value < requirement.getValue() && min) {
	//		return false;
	//	} else if (value > requirement.getValue() && !min) {
	//		return false;
	//	}
	//}

	//return true;
}

void PlayerList::sendMessage(const wstring& name, const wstring& message)
{
	shared_ptr<ServerPlayer> player = getPlayer(name);
	if (player != nullptr)
	{
		player->connection->send(std::make_shared<ChatPacket>(message));
	}
}

void PlayerList::broadcast(double x, double y, double z, double range, int dimension, shared_ptr<Packet> packet)
{
	broadcast(nullptr, x, y, z, range, dimension, packet);
}

void PlayerList::broadcast(shared_ptr<Player> except, double x, double y, double z, double range, int dimension, shared_ptr<Packet> packet)
{
	// 4J - altered so that we don't send to the same machine more than once. Add the source player to the machines we have "sent" to as it doesn't need to go to that
	// machine either
	vector< shared_ptr<ServerPlayer> > sentTo;
	if( except != nullptr )
	{
		sentTo.push_back(dynamic_pointer_cast<ServerPlayer>(except));
	}

	for (unsigned int i = 0; i < players.size(); i++)
	{
		shared_ptr<ServerPlayer> p = players[i];
		if (p == except) continue;
		if (p->dimension != dimension) continue;

		// 4J - don't send to the same machine more than once
		bool dontSend = false;
		if( sentTo.size() )
		{
			INetworkPlayer *thisPlayer = p->connection->getNetworkPlayer();
			if( thisPlayer == nullptr )
			{
				dontSend = true;
			}
			else
			{
				for(unsigned int j = 0; j < sentTo.size(); j++ )
				{
					shared_ptr<ServerPlayer> player2 = sentTo[j];
					INetworkPlayer *otherPlayer = player2->connection->getNetworkPlayer();
					if( otherPlayer != nullptr && thisPlayer->IsSameSystem(otherPlayer) )
					{
						dontSend = true;
					}
				}
			}
		}
		if( dontSend )
		{
			continue;
		}


		double xd = x - p->x;
		double yd = y - p->y;
		double zd = z - p->z;
		if (xd * xd + yd * yd + zd * zd < range * range)
		{
#if 0 // _DEBUG
			shared_ptr<LevelSoundPacket> SoundPacket= dynamic_pointer_cast<LevelSoundPacket>(packet);

			if(SoundPacket)
			{

				app.DebugPrintf("---broadcast - eSoundType_[%d] ",SoundPacket->getSound());
				OutputDebugStringW(ConsoleSoundEngine::wchSoundNames[SoundPacket->getSound()]);
				app.DebugPrintf("\n");
			}
#endif
			p->connection->send(packet);
			sentTo.push_back( p );
		}
	}

}

void PlayerList::saveAll(ProgressListener *progressListener, bool bDeleteGuestMaps /*= false*/)
{
	if(progressListener != nullptr) progressListener->progressStart(IDS_PROGRESS_SAVING_PLAYERS);
	// 4J - playerIo can be nullptr if we have have to exit a game really early on due to network failure
	if(playerIo)
	{
		playerIo->saveAllCachedData();
		for (unsigned int i = 0; i < players.size(); i++)
		{
			playerIo->save(players[i]);

			//4J Stu - We don't want to save the map data for guests, so when we are sure that the player is gone delete the map
			if(bDeleteGuestMaps && players[i]->isGuest()) playerIo->deleteMapFilesForPlayer(players[i]);

			if(progressListener != nullptr) progressListener->progressStagePercentage((i * 100)/ static_cast<int>(players.size()));
		}
		playerIo->clearOldPlayerFiles();
		playerIo->saveMapIdLookup();
	}
}

void PlayerList::whiteList(const wstring& playerName)
{
}

void PlayerList::blackList(const wstring& playerName)
{
}

void PlayerList::reloadWhitelist()
{
}

void PlayerList::sendLevelInfo(shared_ptr<ServerPlayer> player, ServerLevel *level)
{
	player->connection->send(std::make_shared<SetTimePacket>(level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)));
	if (level->isRaining())
	{
		player->connection->send(std::make_shared<GameEventPacket>(GameEventPacket::START_RAINING, 0));
	}
	else
	{
		// 4J Stu - Fix for #44836 - Customer Encountered: Out of Sync Weather [A-10]
		// If it was raining when the player left the level, and is now not raining we need to make sure that state is updated
		player->connection->send(std::make_shared<GameEventPacket>(GameEventPacket::STOP_RAINING, 0));
	}

	// send the stronghold position if there is one
	if((level->dimension->id==0) && level->getLevelData()->getHasStronghold())
	{
		player->connection->send(std::make_shared<XZPacket>(XZPacket::STRONGHOLD, level->getLevelData()->getXStronghold(), level->getLevelData()->getZStronghold()));
	}
}

void PlayerList::sendAllPlayerInfo(shared_ptr<ServerPlayer> player)
{
	player->refreshContainer(player->inventoryMenu);
	player->resetSentInfo();
	player->connection->send(std::make_shared<SetCarriedItemPacket>(player->inventory->selected));
}

int PlayerList::getPlayerCount()
{
	return static_cast<int>(players.size());
}

int PlayerList::getPlayerCount(ServerLevel *level)
{
	int count = 0;

	for(auto& player : players)
	{
		if( player->level == level ) ++count;
	}

	return count;
}

int PlayerList::getMaxPlayers()
{
	return maxPlayers;
}

MinecraftServer *PlayerList::getServer()
{
	return server;
}

int PlayerList::getViewDistance()
{
	return viewDistance;
}

void PlayerList::setOverrideGameMode(GameType *gameMode)
{
	overrideGameMode = gameMode;
}

void PlayerList::updatePlayerGameMode(shared_ptr<ServerPlayer> newPlayer, shared_ptr<ServerPlayer> oldPlayer, Level *level)
{

	// reset the player's game mode (first pick from old, then copy level if
	// necessary)
	if (oldPlayer != nullptr)
	{
		newPlayer->gameMode->setGameModeForPlayer(oldPlayer->gameMode->getGameModeForPlayer());
	}
	else if (overrideGameMode != nullptr)
	{
		newPlayer->gameMode->setGameModeForPlayer(overrideGameMode);
	}
	newPlayer->gameMode->updateGameMode(level->getLevelData()->getGameType());
}

void PlayerList::setAllowCheatsForAllPlayers(bool allowCommands)
{
	this->allowCheatsForAllPlayers = allowCommands;
}

shared_ptr<ServerPlayer> PlayerList::findAlivePlayerOnSystem(shared_ptr<ServerPlayer> player)
{
	int dimIndex, playerDim;
	dimIndex = playerDim = player->dimension;
	if( dimIndex == -1 ) dimIndex = 1;
	else if( dimIndex == 1) dimIndex = 2;

	INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();
	if( thisPlayer )
	{
		for(auto& newPlayer : players)
		{
			INetworkPlayer *otherPlayer = newPlayer->connection->getNetworkPlayer();

			if( !newPlayer->removed &&
				newPlayer != player &&
				newPlayer->dimension == playerDim &&
				otherPlayer &&
				otherPlayer->IsSameSystem( thisPlayer )
				)
			{
				return newPlayer;
			}
		}
	}

	return nullptr;
}

void PlayerList::removePlayerFromReceiving(shared_ptr<ServerPlayer> player, bool usePlayerDimension /*= true*/, int dimension /*= 0*/)
{
	int dimIndex, playerDim;
	dimIndex = playerDim = usePlayerDimension ? player->dimension : dimension;
	if( dimIndex == -1 ) dimIndex = 1;
	else if( dimIndex == 1) dimIndex = 2;

#ifndef _CONTENT_PACKAGE
	app.DebugPrintf("Requesting remove player %ls as primary in dimension %d\n", player->name.c_str(), dimIndex);
#endif
	bool playerRemoved = false;

    auto it = find(receiveAllPlayers[dimIndex].begin(), receiveAllPlayers[dimIndex].end(), player);
    if( it != receiveAllPlayers[dimIndex].end() )
	{
#ifndef _CONTENT_PACKAGE
		app.DebugPrintf("Remove: Removing player %ls as primary in dimension %d\n", player->name.c_str(), dimIndex);
#endif
		receiveAllPlayers[dimIndex].erase(it);
		playerRemoved = true;
	}

	INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();
	if( thisPlayer && playerRemoved )
	{
		for(auto& newPlayer : players)
		{
			INetworkPlayer *otherPlayer = newPlayer->connection->getNetworkPlayer();

			if( newPlayer != player &&
				newPlayer->dimension == playerDim &&
				otherPlayer &&
				otherPlayer->IsSameSystem( thisPlayer )
				)
			{
#ifndef _CONTENT_PACKAGE
				app.DebugPrintf("Remove: Adding player %ls as primary in dimension %d\n", newPlayer->name.c_str(), dimIndex);
#endif
				receiveAllPlayers[dimIndex].push_back( newPlayer );
				break;
			}
		}
	}
	else if( thisPlayer == nullptr )
	{
#ifndef _CONTENT_PACKAGE
		app.DebugPrintf("Remove: Qnet player for %ls was nullptr so re-checking all players\n", player->name.c_str() );
#endif
		// 4J Stu - Something went wrong, or possibly the QNet player left before we got here.
		// Re-check all active players and make sure they have someone on their system to receive all packets
		for(auto& newPlayer : players)
		{
			INetworkPlayer *checkingPlayer = newPlayer->connection->getNetworkPlayer();

			if( checkingPlayer )
			{
				int newPlayerDim = 0;
				if( newPlayer->dimension == -1 ) newPlayerDim = 1;
				else if( newPlayer->dimension == 1) newPlayerDim = 2;
				bool foundPrimary = false;
				for(auto& primaryPlayer : receiveAllPlayers[newPlayerDim])
				{
					INetworkPlayer *primPlayer = primaryPlayer->connection->getNetworkPlayer();
					if(primPlayer != nullptr && checkingPlayer->IsSameSystem( primPlayer ) )
					{
						foundPrimary = true;
						break;
					}
				}
				if(!foundPrimary)
				{
#ifndef _CONTENT_PACKAGE
					app.DebugPrintf("Remove: Adding player %ls as primary in dimension %d\n", newPlayer->name.c_str(), newPlayerDim);
#endif
					receiveAllPlayers[newPlayerDim].push_back( newPlayer );
				}
			}
		}
	}
}

void PlayerList::addPlayerToReceiving(shared_ptr<ServerPlayer> player)
{
	int playerDim = 0;
	if( player->dimension == -1 ) playerDim = 1;
	else if( player->dimension == 1) playerDim = 2;

#ifndef _CONTENT_PACKAGE
	app.DebugPrintf("Requesting add player %ls as primary in dimension %d\n", player->name.c_str(), playerDim);
#endif

	bool shouldAddPlayer = true;

	INetworkPlayer *thisPlayer = player->connection->getNetworkPlayer();

	if( thisPlayer == nullptr )
	{
#ifndef _CONTENT_PACKAGE
		app.DebugPrintf("Add: Qnet player for player %ls is nullptr so not adding them\n", player->name.c_str() );
#endif
		shouldAddPlayer = false;
	}
	else
	{
		for(auto& oldPlayer : receiveAllPlayers[playerDim])
		{
			INetworkPlayer *checkingPlayer = oldPlayer->connection->getNetworkPlayer();
			if(checkingPlayer != nullptr && checkingPlayer->IsSameSystem( thisPlayer ) )
			{
				shouldAddPlayer = false;
				break;
			}
		}
	}

	if( shouldAddPlayer )
	{
#ifndef _CONTENT_PACKAGE
		app.DebugPrintf("Add: Adding player %ls as primary in dimension %d\n", player->name.c_str(), playerDim);
#endif
		receiveAllPlayers[playerDim].push_back( player );
	}
}

bool PlayerList::canReceiveAllPackets(shared_ptr<ServerPlayer> player)
{
	int playerDim = 0;
	if( player->dimension == -1 ) playerDim = 1;
	else if( player->dimension == 1) playerDim = 2;
	for(const auto& newPlayer : receiveAllPlayers[playerDim])
	{
		if(newPlayer == player)
		{
			return true;
		}
	}
	return false;
}

void PlayerList::kickPlayerByShortId(BYTE networkSmallId)
{
	EnterCriticalSection(&m_kickPlayersCS);
	m_smallIdsToKick.push_back(networkSmallId);
	LeaveCriticalSection(&m_kickPlayersCS);
}

void  PlayerList::closePlayerConnectionBySmallId(BYTE networkSmallId)
{
	EnterCriticalSection(&m_closePlayersCS);
	m_smallIdsToClose.push_back(networkSmallId);
	LeaveCriticalSection(&m_closePlayersCS);
}

void PlayerList::queueSmallIdForRecycle(BYTE smallId)
{
	EnterCriticalSection(&m_closePlayersCS);
	m_smallIdsToClose.push_back(smallId);
	LeaveCriticalSection(&m_closePlayersCS);
}

bool PlayerList::isXuidBanned(PlayerUID xuid)
{
	if( xuid == INVALID_XUID ) return false;

	bool banned = false;

	for(PlayerUID it : m_bannedXuids)
	{
		if( ProfileManager.AreXUIDSEqual( xuid, it ) )
		{
			banned = true;
			break;
		}
	}

	return banned;
}

// AP added for Vita so the range can be increased once the level starts
void PlayerList::setViewDistance(int newViewDistance)
{
	viewDistance = newViewDistance;
}