SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix converting txt to json file

Browse Source
This commit is contained in:
Jake Potrebic
2021-01-04 19:49:15 -08:00
parent 73deb32107
commit bf99953fa0
3 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
paper-server/patches/sources/net/minecraft/server/players/PlayerList.java.patch
View File

@@ -63,7 +63,7 @@
public final PlayerDataStorage playerIo;
private boolean doWhiteList;
private final LayeredRegistryAccess<RegistryLayer> registries;
@@ -134,13 +156,24 @@
@@ -134,58 +156,137 @@
private static final boolean ALLOW_LOGOUTIVATOR = false;
private int sendAllPlayerInfoIn;
@@ -90,8 +90,9 @@
this.server = server;
this.registries = registryManager;
this.maxPlayers = maxPlayers;
@@ -148,44 +181,111 @@
this.playerIo = saveHandler;
}
+ abstract public void loadAndSaveFiles(); // Paper - fix converting txt to json file; moved from DedicatedPlayerList constructor
public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
+ player.isRealPlayer = true; // Paper
@@ -211,7 +212,7 @@
ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData);
connection.setupInboundProtocol(GameProtocols.SERVERBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(this.server.registryAccess())), playerconnection);
@@ -194,7 +294,9 @@
@@ -194,7 +295,9 @@
boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
boolean flag2 = gamerules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
@@ -222,7 +223,7 @@
playerconnection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
playerconnection.send(new ClientboundPlayerAbilitiesPacket(player.getAbilities()));
playerconnection.send(new ClientboundSetHeldSlotPacket(player.getInventory().selected));
@@ -213,8 +315,10 @@
@@ -213,8 +316,10 @@
} else {
ichatmutablecomponent = Component.translatable("multiplayer.player.joined.renamed", player.getDisplayName(), s);
}
@@ -234,7 +235,7 @@
playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
ServerStatus serverping = this.server.getStatus();
@@ -222,17 +326,85 @@
@@ -222,17 +327,85 @@
player.sendServerStatus(serverping);
}
@@ -325,7 +326,7 @@
}
public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
@@ -269,30 +441,31 @@
@@ -269,30 +442,31 @@
}
public void addWorldborderListener(ServerLevel world) {
@@ -362,7 +363,7 @@
}
@Override
@@ -319,14 +492,15 @@
@@ -319,14 +493,15 @@
}
protected void save(ServerPlayer player) {
@@ -380,7 +381,7 @@
if (advancementdataplayer != null) {
advancementdataplayer.save();
@@ -334,95 +508,194 @@
@@ -334,95 +509,194 @@
}
@@ -571,13 +572,13 @@
+ if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile)) {
+ event.disallow(PlayerLoginEvent.Result.KICK_FULL, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)); // Spigot // Paper - Adventure
+ }
}
+ }
+
+ this.cserver.getPluginManager().callEvent(event);
+ if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
+ loginlistener.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.kickMessage())); // Paper - Adventure
+ return null;
+ }
}
+ return entity;
}
@@ -613,7 +614,7 @@
if (entityplayer1 != null) {
set.add(entityplayer1);
@@ -431,72 +704,160 @@
@@ -431,72 +705,160 @@
Iterator iterator1 = set.iterator();
while (iterator1.hasNext()) {
@@ -795,7 +796,7 @@
return entityplayer1;
}
@@ -516,15 +877,32 @@
@@ -516,15 +878,32 @@
}
public void sendPlayerPermissionLevel(ServerPlayer player) {
@@ -830,7 +831,7 @@
this.sendAllPlayerInfoIn = 0;
}
@@ -541,6 +919,25 @@
@@ -541,6 +920,25 @@
}
@@ -856,7 +857,7 @@
public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
Iterator iterator = this.players.iterator();
@@ -554,7 +951,7 @@
@@ -554,7 +952,7 @@
}
@@ -865,7 +866,7 @@
PlayerTeam scoreboardteam = source.getTeam();
if (scoreboardteam != null) {
@@ -573,7 +970,7 @@
@@ -573,7 +971,7 @@
}
}
@@ -874,7 +875,7 @@
PlayerTeam scoreboardteam = source.getTeam();
if (scoreboardteam == null) {
@@ -619,7 +1016,7 @@
@@ -619,7 +1017,7 @@
}
public void deop(GameProfile profile) {
@@ -883,7 +884,7 @@
ServerPlayer entityplayer = this.getPlayer(profile.getId());
if (entityplayer != null) {
@@ -629,6 +1026,11 @@
@@ -629,6 +1027,11 @@
}
private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
@@ -895,7 +896,7 @@
if (player.connection != null) {
byte b0;
@@ -643,36 +1045,53 @@
@@ -643,36 +1046,53 @@
player.connection.send(new ClientboundEntityEventPacket(player, b0));
}
@@ -962,7 +963,7 @@
if (entityplayer != player && entityplayer.level().dimension() == worldKey) {
double d4 = x - entityplayer.getX();
double d5 = y - entityplayer.getY();
@@ -687,10 +1106,12 @@
@@ -687,10 +1107,12 @@
}
public void saveAll() {
@@ -975,7 +976,7 @@
}
public UserWhiteList getWhiteList() {
@@ -712,15 +1133,19 @@
@@ -712,15 +1134,19 @@
public void reloadWhiteList() {}
public void sendLevelInfo(ServerPlayer player, ServerLevel world) {
@@ -999,7 +1000,7 @@
}
player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0.0F));
@@ -729,8 +1154,16 @@
@@ -729,8 +1155,16 @@
public void sendAllPlayerInfo(ServerPlayer player) {
player.inventoryMenu.sendAllDataToRemote();
@@ -1017,7 +1018,7 @@
}
public int getPlayerCount() {
@@ -746,6 +1179,7 @@
@@ -746,6 +1180,7 @@
}
public void setUsingWhiteList(boolean whitelistEnabled) {
@@ -1025,7 +1026,7 @@
this.doWhiteList = whitelistEnabled;
}
@@ -786,12 +1220,36 @@
@@ -786,12 +1221,36 @@
}
public void removeAll() {
@@ -1064,7 +1065,7 @@
public void broadcastSystemMessage(Component message, boolean overlay) {
this.broadcastSystemMessage(message, (entityplayer) -> {
return message;
@@ -819,24 +1277,43 @@
@@ -819,24 +1278,43 @@
}
public void broadcastChatMessage(PlayerChatMessage message, ServerPlayer sender, ChatType.Bound params) {
@@ -1111,7 +1112,7 @@
}
if (flag1 && sender != null) {
@@ -845,20 +1322,27 @@
@@ -845,20 +1323,27 @@
}
@@ -1144,7 +1145,7 @@
Path path = file2.toPath();
if (FileUtil.isPathNormalized(path) && FileUtil.isPathPortable(path) && path.startsWith(file.getPath()) && file2.isFile()) {
@@ -867,7 +1351,7 @@
@@ -867,7 +1352,7 @@
}
serverstatisticmanager = new ServerStatsCounter(this.server, file1);
@@ -1153,7 +1154,7 @@
}
return serverstatisticmanager;
@@ -875,13 +1359,13 @@
@@ -875,13 +1360,13 @@
public PlayerAdvancements getPlayerAdvancements(ServerPlayer player) {
UUID uuid = player.getUUID();
@@ -1169,7 +1170,7 @@
}
advancementdataplayer.setPlayer(player);
@@ -932,15 +1416,28 @@
@@ -932,15 +1417,28 @@
}
public void reloadResources() {