OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fire PlayerJoinEvent when Player is actually ready

Browse source 
For years, plugin developers have had to delay many things they do
inside of the PlayerJoinEvent by 1 tick to make it actually work.

This all boiled down to 1 reason why: The event fired before the
player was fully ready and joined to the world!

Additionally, if that player logged out on a vehicle, the event
fired before the vehicle was even loaded, so that plugins had no
access to the vehicle during this event either.

This change finally fixes this issue, fully preparing the player
into the world as a fully ready entity, vehicle included.

There should be no plugins that break because of this change, but might
improve consistency with other plugins instead.

For example, if 2 plugins listens to this event, and the first one
teleported the player in the event, then the 2nd plugin actually
would be getting a valid player!

This was very non deterministic. This change will ensure every plugin
receives a deterministic result, and should no longer require 1 tick
delays anymore.

== AT ==
public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
This commit is contained in:
Aikar 2020-04-19 00:05:46 -04:00
parent b7898433d0
commit d7f24e6729
3 changed files with 122 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
paper-server/patches/sources/net/minecraft/server/level/ChunkMap.java.patch
View file

@ -320,7 +320,7 @@
}
}
@@ -1215,9 +1291,18 @@
@@ -1215,9 +1291,19 @@
}
public void addEntity(Entity entity) {
@ -332,6 +332,7 @@
+ return;
+ }
+ // Paper end - ignore and warn about illegal addEntity calls instead of crashing server
+ if (entity instanceof ServerPlayer && ((ServerPlayer) entity).supressTrackerForLogin) return; // Paper - Fire PlayerJoinEvent when Player is actually ready; Delay adding to tracker until after list packets
if (!(entity instanceof EnderDragonPart)) {
EntityType<?> entitytypes = entity.getType();
int i = entitytypes.clientTrackingRange() * 16;
@ -339,7 +340,7 @@
if (i != 0) {
int j = entitytypes.updateInterval();
@@ -1250,6 +1335,7 @@
@@ -1250,6 +1336,7 @@
}
protected void removeEntity(Entity entity) {
@ -347,7 +348,7 @@
if (entity instanceof ServerPlayer entityplayer) {
this.updatePlayerStatus(entityplayer, false);
ObjectIterator objectiterator = this.entityMap.values().iterator();
@@ -1391,7 +1477,7 @@
@@ -1391,7 +1478,7 @@
});
}
@ -356,7 +357,7 @@
protected ChunkDistanceManager(final Executor workerExecutor, final Executor mainThreadExecutor) {
super(workerExecutor, mainThreadExecutor);
@@ -1424,7 +1510,7 @@
@@ -1424,7 +1511,7 @@
public final Set<ServerPlayerConnection> seenBy = Sets.newIdentityHashSet();
public TrackedEntity(final Entity entity, final int i, final int j, final boolean flag) {
@ -365,7 +366,7 @@
this.entity = entity;
this.range = i;
this.lastSectionPos = SectionPos.of((EntityAccess) entity);
@@ -1469,6 +1555,7 @@
@@ -1469,6 +1556,7 @@
}
public void removePlayer(ServerPlayer player) {
@ -373,7 +374,7 @@
if (this.seenBy.remove(player.connection)) {
this.serverEntity.removePairing(player);
}
@@ -1476,6 +1563,7 @@
@@ -1476,6 +1564,7 @@
}
public void updatePlayer(ServerPlayer player) {
@ -381,7 +382,7 @@
if (player != this.entity) {
Vec3 vec3d = player.position().subtract(this.entity.position());
int i = ChunkMap.this.getPlayerViewDistance(player);
@@ -1484,6 +1572,11 @@
@@ -1484,6 +1573,11 @@
double d2 = d0 * d0;
boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
@ -393,7 +394,7 @@
if (flag) {
if (this.seenBy.add(player.connection)) {
this.serverEntity.addPairing(player);
@@ -1506,6 +1599,7 @@
@@ -1506,6 +1600,7 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
int j = entity.getType().clientTrackingRange() * 16;

139
paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
View file

@ -114,7 +114,7 @@
@Nullable
private Vec3 startingToFallPosition;
@Nullable
@@ -258,7 +293,33 @@
@@ -258,7 +293,34 @@
private final CommandSource commandSource;
private int containerCounter;
public boolean wonGame;
@ -140,6 +140,7 @@
+ public double maxHealthCache;
+ public boolean joining = true;
+ public boolean sentListPacket = false;
+ public boolean supressTrackerForLogin = false; // Paper - Fire PlayerJoinEvent when Player is actually ready
+ public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
+ // CraftBukkit end
+ public boolean isRealPlayer; // Paper
@ -148,7 +149,7 @@
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
this.chatVisibility = ChatVisiblity.FULL;
@@ -266,7 +327,7 @@
@@ -266,7 +328,7 @@
this.canChatColor = true;
this.lastActionTime = Util.getMillis();
this.requestedViewDistance = 2;
@ -157,7 +158,7 @@
this.lastSectionPos = SectionPos.of(0, 0, 0);
this.chunkTrackingView = ChunkTrackingView.EMPTY;
this.respawnDimension = Level.OVERWORLD;
@@ -340,6 +401,13 @@
@@ -340,6 +402,13 @@
public void sendSystemMessage(Component message) {
ServerPlayer.this.sendSystemMessage(message);
}
@ -171,7 +172,7 @@
};
this.textFilter = server.createTextFilterForPlayer(this);
this.gameMode = server.createGameModeForPlayer(this);
@@ -349,17 +417,71 @@
@@ -349,17 +418,71 @@
this.server = server;
this.stats = server.getPlayerList().getPlayerStats(this);
this.advancements = server.getPlayerList().getPlayerAdvancements(this);
@ -246,7 +247,7 @@
int i = Math.max(0, this.server.getSpawnRadius(world));
int j = Mth.floor(world.getWorldBorder().getDistanceToBorder((double) basePos.getX(), (double) basePos.getZ()));
@@ -395,14 +517,20 @@
@@ -395,14 +518,20 @@
Objects.requireNonNull(basePos);
crashreportsystemdetails.setDetail("Origin", basePos::toString);
@ -269,7 +270,7 @@
});
throw new ReportedException(crashreport);
}
@@ -440,7 +568,7 @@
@@ -440,7 +569,7 @@
dataresult = WardenSpawnTracker.CODEC.parse(new Dynamic(NbtOps.INSTANCE, nbt.get("warden_spawn_tracker")));
logger = ServerPlayer.LOGGER;
Objects.requireNonNull(logger);
@ -278,7 +279,7 @@
this.wardenSpawnTracker = wardenspawntracker;
});
}
@@ -457,17 +585,26 @@
@@ -457,17 +586,26 @@
return this.server.getRecipeManager().byKey(resourcekey).isPresent();
});
}
@ -306,7 +307,7 @@
Logger logger1 = ServerPlayer.LOGGER;
Objects.requireNonNull(logger1);
@@ -482,7 +619,7 @@
@@ -482,7 +620,7 @@
dataresult = BlockPos.CODEC.parse(NbtOps.INSTANCE, nbtbase);
logger = ServerPlayer.LOGGER;
Objects.requireNonNull(logger);
@ -315,7 +316,7 @@
this.raidOmenPosition = blockposition;
});
}
@@ -492,7 +629,7 @@
@@ -492,7 +630,7 @@
@Override
public void addAdditionalSaveData(CompoundTag nbt) {
super.addAdditionalSaveData(nbt);
@ -324,7 +325,7 @@
Logger logger = ServerPlayer.LOGGER;
Objects.requireNonNull(logger);
@@ -526,6 +663,7 @@
@@ -526,6 +664,7 @@
nbt.put("SpawnDimension", nbtbase);
});
}
@ -332,7 +333,7 @@
nbt.putBoolean("spawn_extra_particles_on_fall", this.spawnExtraParticlesOnFall);
if (this.raidOmenPosition != null) {
@@ -544,7 +682,20 @@
@@ -544,7 +683,20 @@
Entity entity = this.getRootVehicle();
Entity entity1 = this.getVehicle();
@ -354,7 +355,7 @@
CompoundTag nbttagcompound1 = new CompoundTag();
CompoundTag nbttagcompound2 = new CompoundTag();
@@ -564,7 +715,7 @@
@@ -564,7 +716,7 @@
ServerLevel worldserver = (ServerLevel) world;
CompoundTag nbttagcompound = ((CompoundTag) nbt.get()).getCompound("RootVehicle");
Entity entity = EntityType.loadEntityRecursive(nbttagcompound.getCompound("Entity"), worldserver, EntitySpawnReason.LOAD, (entity1) -> {
@ -363,7 +364,7 @@
});
if (entity == null) {
@@ -598,12 +749,12 @@
@@ -598,12 +750,12 @@
if (!this.isPassenger()) {
ServerPlayer.LOGGER.warn("Couldn't reattach entity to player");
@ -378,7 +379,7 @@
}
}
}
@@ -625,7 +776,7 @@
@@ -625,7 +777,7 @@
CompoundTag nbttagcompound1 = new CompoundTag();
entityenderpearl.save(nbttagcompound1);
@ -387,7 +388,7 @@
Logger logger = ServerPlayer.LOGGER;
Objects.requireNonNull(logger);
@@ -651,7 +802,7 @@
@@ -651,7 +803,7 @@
nbttaglist.forEach((nbtbase1) -> {
if (nbtbase1 instanceof CompoundTag nbttagcompound) {
if (nbttagcompound.contains("ender_pearl_dimension")) {
@ -396,7 +397,7 @@
Logger logger = ServerPlayer.LOGGER;
Objects.requireNonNull(logger);
@@ -686,6 +837,29 @@
@@ -686,6 +838,29 @@
}
@ -426,7 +427,7 @@
public void setExperiencePoints(int points) {
float f = (float) this.getXpNeededForNextLevel();
float f1 = (f - 1.0F) / f;
@@ -744,6 +918,11 @@
@@ -744,6 +919,11 @@
@Override
public void tick() {
@ -438,7 +439,7 @@
this.tickClientLoadTimeout();
this.gameMode.tick();
this.wardenSpawnTracker.tick();
@@ -751,9 +930,13 @@
@@ -751,9 +931,13 @@
--this.invulnerableTime;
}
@ -455,7 +456,7 @@
this.containerMenu = this.inventoryMenu;
}
@@ -807,7 +990,7 @@
@@ -807,7 +991,7 @@
public void doTick() {
try {
@ -464,7 +465,7 @@
super.tick();
}
@@ -820,7 +1003,7 @@
@@ -820,7 +1004,7 @@
}
if (this.getHealth() != this.lastSentHealth || this.lastSentFood != this.foodData.getFoodLevel() || this.foodData.getSaturationLevel() == 0.0F != this.lastFoodSaturationZero) {
@ -473,7 +474,7 @@
this.lastSentHealth = this.getHealth();
this.lastSentFood = this.foodData.getFoodLevel();
this.lastFoodSaturationZero = this.foodData.getSaturationLevel() == 0.0F;
@@ -851,6 +1034,12 @@
@@ -851,6 +1035,12 @@
this.updateScoreForCriteria(ObjectiveCriteria.EXPERIENCE, Mth.ceil((float) this.lastRecordedExperience));
}
@ -486,10 +487,12 @@
if (this.experienceLevel != this.lastRecordedLevel) {
this.lastRecordedLevel = this.experienceLevel;
this.updateScoreForCriteria(ObjectiveCriteria.LEVEL, Mth.ceil((float) this.lastRecordedLevel));
@@ -865,6 +1054,20 @@
CriteriaTriggers.LOCATION.trigger(this);
}
@@ -863,8 +1053,22 @@
if (this.tickCount % 20 == 0) {
CriteriaTriggers.LOCATION.trigger(this);
+ }
+
+ // CraftBukkit start - initialize oldLevel, fire PlayerLevelChangeEvent, and tick client-sided world border
+ if (this.oldLevel == -1) {
+ this.oldLevel = this.experienceLevel;
@ -498,8 +501,8 @@
+ if (this.oldLevel != this.experienceLevel) {
+ CraftEventFactory.callPlayerLevelChangeEvent(this.getBukkitEntity(), this.oldLevel, this.experienceLevel);
+ this.oldLevel = this.experienceLevel;
+ }
+
}
+ if (this.getBukkitEntity().hasClientWorldBorder()) {
+ ((CraftWorldBorder) this.getBukkitEntity().getWorldBorder()).getHandle().tick();
+ }
@ -507,7 +510,7 @@
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking player");
CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Player being ticked");
@@ -893,7 +1096,7 @@
@@ -893,7 +1097,7 @@
if (this.level().getDifficulty() == Difficulty.PEACEFUL && this.serverLevel().getGameRules().getBoolean(GameRules.RULE_NATURAL_REGENERATION)) {
if (this.tickCount % 20 == 0) {
if (this.getHealth() < this.getMaxHealth()) {
@ -516,7 +519,7 @@
}
float f = this.foodData.getSaturationLevel();
@@ -946,19 +1149,103 @@
@@ -946,19 +1150,103 @@
}
private void updateScoreForCriteria(ObjectiveCriteria criterion, int score) {
@ -624,7 +627,7 @@
this.connection.send(new ClientboundPlayerCombatKillPacket(this.getId(), ichatbasecomponent), PacketSendListener.exceptionallySend(() -> {
boolean flag1 = true;
String s = ichatbasecomponent.getString(256);
@@ -988,12 +1275,23 @@
@@ -988,12 +1276,23 @@
if (this.serverLevel().getGameRules().getBoolean(GameRules.RULE_FORGIVE_DEAD_PLAYERS)) {
this.tellNeutralMobsThatIDied();
}
@ -652,7 +655,7 @@
LivingEntity entityliving = this.getKillCredit();
if (entityliving != null) {
@@ -1028,10 +1326,12 @@
@@ -1028,10 +1327,12 @@
public void awardKillScore(Entity entityKilled, DamageSource damageSource) {
if (entityKilled != this) {
super.awardKillScore(entityKilled, damageSource);
@ -668,7 +671,7 @@
} else {
this.awardStat(Stats.MOB_KILLS);
}
@@ -1049,7 +1349,8 @@
@@ -1049,7 +1350,8 @@
int i = scoreboardteam.getColor().getId();
if (i >= 0 && i < criterions.length) {
@ -678,7 +681,7 @@
}
}
@@ -1062,8 +1363,8 @@
@@ -1062,8 +1364,8 @@
} else {
Entity entity = source.getEntity();
@ -689,7 +692,7 @@
if (!this.canHarmPlayer(entityhuman)) {
return false;
@@ -1074,8 +1375,8 @@
@@ -1074,8 +1376,8 @@
AbstractArrow entityarrow = (AbstractArrow) entity;
Entity entity1 = entityarrow.getOwner();
@ -700,7 +703,7 @@
if (!this.canHarmPlayer(entityhuman1)) {
return false;
@@ -1083,38 +1384,78 @@
@@ -1083,38 +1385,78 @@
}
}
@ -787,7 +790,7 @@
}
public static Optional<ServerPlayer.RespawnPosAngle> findRespawnAndUseSpawnBlock(ServerLevel world, BlockPos pos, float spawnAngle, boolean spawnForced, boolean alive) {
@@ -1129,11 +1470,11 @@
@@ -1129,11 +1471,11 @@
}
return optional.map((vec3d) -> {
@ -801,7 +804,7 @@
});
} else if (!spawnForced) {
return Optional.empty();
@@ -1142,7 +1483,7 @@
@@ -1142,7 +1484,7 @@
BlockState iblockdata1 = world.getBlockState(pos.above());
boolean flag3 = iblockdata1.getBlock().isPossibleToRespawnInThis(iblockdata1);
@ -810,7 +813,7 @@
}
}
@@ -1160,6 +1501,7 @@
@@ -1160,6 +1502,7 @@
@Nullable
@Override
public ServerPlayer teleport(TeleportTransition teleportTarget) {
@ -818,7 +821,7 @@
if (this.isRemoved()) {
return null;
} else {
@@ -1169,39 +1511,78 @@
@@ -1169,39 +1512,78 @@
ServerLevel worldserver = teleportTarget.newLevel();
ServerLevel worldserver1 = this.serverLevel();
@ -905,7 +908,7 @@
this.connection.resetPosition();
worldserver.addDuringTeleport(this);
gameprofilerfiller.pop();
@@ -1215,12 +1596,30 @@
@@ -1215,12 +1597,30 @@
this.lastSentExp = -1;
this.lastSentHealth = -1.0F;
this.lastSentFood = -1;
@ -936,7 +939,7 @@
public void forceSetRotation(float yaw, float pitch) {
this.connection.send(new ClientboundPlayerRotationPacket(yaw, pitch));
}
@@ -1228,13 +1627,21 @@
@@ -1228,13 +1628,21 @@
public void triggerDimensionChangeTriggers(ServerLevel origin) {
ResourceKey<Level> resourcekey = origin.dimension();
ResourceKey<Level> resourcekey1 = this.level().dimension();
@ -961,7 +964,7 @@
this.enteredNetherPosition = null;
}
@@ -1251,36 +1658,63 @@
@@ -1251,36 +1659,63 @@
this.containerMenu.broadcastChanges();
}
@ -1040,7 +1043,7 @@
this.awardStat(Stats.SLEEP_IN_BED);
CriteriaTriggers.SLEPT_IN_BED.trigger(this);
});
@@ -1293,9 +1727,8 @@
@@ -1293,9 +1728,8 @@
return either;
}
}
@ -1051,7 +1054,7 @@
}
@Override
@@ -1322,13 +1755,31 @@
@@ -1322,13 +1756,31 @@
@Override
public void stopSleepInBed(boolean skipSleepTimer, boolean updateSleepingPlayers) {
@ -1084,7 +1087,7 @@
}
}
@@ -1387,8 +1838,9 @@
@@ -1387,8 +1839,9 @@
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos(), front));
}
@ -1095,7 +1098,7 @@
}
@Override
@@ -1396,13 +1848,35 @@
@@ -1396,13 +1849,35 @@
if (factory == null) {
return OptionalInt.empty();
} else {
@ -1131,7 +1134,7 @@
if (container == null) {
if (this.isSpectator()) {
this.displayClientMessage(Component.translatable("container.spectatorCantOpen").withStyle(ChatFormatting.RED), true);
@@ -1410,9 +1884,11 @@
@@ -1410,9 +1885,11 @@
return OptionalInt.empty();
} else {
@ -1145,7 +1148,7 @@
return OptionalInt.of(this.containerCounter);
}
}
@@ -1425,15 +1901,26 @@
@@ -1425,15 +1902,26 @@
@Override
public void openHorseInventory(AbstractHorse horse, Container inventory) {
@ -1175,7 +1178,7 @@
this.initMenu(this.containerMenu);
}
@@ -1456,6 +1943,13 @@
@@ -1456,6 +1944,13 @@
@Override
public void closeContainer() {
@ -1189,7 +1192,7 @@
this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
this.doCloseContainer();
}
@@ -1485,19 +1979,19 @@
@@ -1485,19 +1980,19 @@
i = Math.round((float) Math.sqrt(deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ) * 100.0F);
if (i > 0) {
this.awardStat(Stats.SWIM_ONE_CM, i);
@ -1212,7 +1215,7 @@
}
} else if (this.onClimbable()) {
if (deltaY > 0.0D) {
@@ -1508,13 +2002,13 @@
@@ -1508,13 +2003,13 @@
if (i > 0) {
if (this.isSprinting()) {
this.awardStat(Stats.SPRINT_ONE_CM, i);
@ -1229,7 +1232,7 @@
}
}
} else if (this.isFallFlying()) {
@@ -1557,7 +2051,7 @@
@@ -1557,7 +2052,7 @@
@Override
public void awardStat(Stat<?> stat, int amount) {
this.stats.increment(this, stat, amount);
@ -1238,7 +1241,7 @@
scoreaccess.add(amount);
});
}
@@ -1565,7 +2059,7 @@
@@ -1565,7 +2060,7 @@
@Override
public void resetStat(Stat<?> stat) {
this.stats.setValue(this, stat, 0);
@ -1247,7 +1250,7 @@
}
@Override
@@ -1597,9 +2091,9 @@
@@ -1597,9 +2092,9 @@
super.jumpFromGround();
this.awardStat(Stats.JUMP);
if (this.isSprinting()) {
@ -1259,7 +1262,7 @@
}
}
@@ -1613,6 +2107,13 @@
@@ -1613,6 +2108,13 @@
public void disconnect() {
this.disconnected = true;
this.ejectPassengers();
@ -1273,7 +1276,7 @@
if (this.isSleeping()) {
this.stopSleepInBed(true, false);
}
@@ -1625,6 +2126,7 @@
@@ -1625,6 +2127,7 @@
public void resetSentInfo() {
this.lastSentHealth = -1.0E8F;
@ -1281,7 +1284,7 @@
}
@Override
@@ -1661,7 +2163,7 @@
@@ -1661,7 +2164,7 @@
this.onUpdateAbilities();
if (alive) {
this.getAttributes().assignBaseValues(oldPlayer.getAttributes());
@ -1290,7 +1293,7 @@
this.setHealth(oldPlayer.getHealth());
this.foodData = oldPlayer.foodData;
Iterator iterator = oldPlayer.getActiveEffects().iterator();
@@ -1669,7 +2171,7 @@
@@ -1669,7 +2172,7 @@
while (iterator.hasNext()) {
MobEffectInstance mobeffect = (MobEffectInstance) iterator.next();
@ -1299,7 +1302,7 @@
}
this.getInventory().replaceWith(oldPlayer.getInventory());
@@ -1680,7 +2182,7 @@
@@ -1680,7 +2183,7 @@
this.portalProcess = oldPlayer.portalProcess;
} else {
this.getAttributes().assignBaseValues(oldPlayer.getAttributes());
@ -1308,7 +1311,7 @@
if (this.serverLevel().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || oldPlayer.isSpectator()) {
this.getInventory().replaceWith(oldPlayer.getInventory());
this.experienceLevel = oldPlayer.experienceLevel;
@@ -1696,7 +2198,7 @@
@@ -1696,7 +2199,7 @@
this.lastSentExp = -1;
this.lastSentHealth = -1.0F;
this.lastSentFood = -1;
@ -1317,7 +1320,7 @@
this.seenCredits = oldPlayer.seenCredits;
this.enteredNetherPosition = oldPlayer.enteredNetherPosition;
this.chunkTrackingView = oldPlayer.chunkTrackingView;
@@ -1752,19 +2254,19 @@
@@ -1752,19 +2255,19 @@
}
@Override
@ -1341,7 +1344,7 @@
}
return flag1;
@@ -1861,8 +2363,13 @@
@@ -1861,8 +2364,13 @@
}
public void sendChatMessage(OutgoingChatMessage message, boolean filterMaskEnabled, ChatType.Bound params) {
@ -1356,7 +1359,7 @@
}
}
@@ -1878,7 +2385,36 @@
@@ -1878,7 +2386,36 @@
}
public void updateOptions(ClientInformation clientOptions) {
@ -1393,7 +1396,7 @@
this.requestedViewDistance = clientOptions.viewDistance();
this.chatVisibility = clientOptions.chatVisibility();
this.canChatColor = clientOptions.chatColors();
@@ -1957,12 +2493,27 @@
@@ -1957,12 +2494,27 @@
this.camera = (Entity) (entity == null ? this : entity);
if (entity1 != this.camera) {
@ -1422,7 +1425,7 @@
}
if (entity != null) {
@@ -1999,11 +2550,11 @@
@@ -1999,11 +2551,11 @@
@Nullable
public Component getTabListDisplayName() {
@ -1436,7 +1439,7 @@
}
@Override
@@ -2046,17 +2597,43 @@
@@ -2046,17 +2598,43 @@
}
public void setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage) {
@ -1487,7 +1490,7 @@
} else {
this.respawnPosition = null;
this.respawnDimension = Level.OVERWORLD;
@@ -2088,18 +2665,44 @@
@@ -2088,18 +2666,44 @@
}
@Override
@ -1536,7 +1539,7 @@
}
this.awardStat(Stats.DROP);
@@ -2275,9 +2878,15 @@
@@ -2275,9 +2879,15 @@
@Override
public void stopRiding() {
@ -1553,7 +1556,7 @@
if (entity instanceof LivingEntity entityliving) {
Iterator iterator = entityliving.getActiveEffects().iterator();
@@ -2375,16 +2984,161 @@
@@ -2375,16 +2985,161 @@
return TicketType.ENDER_PEARL.timeout();
}

76
paper-server/patches/sources/net/minecraft/server/players/PlayerList.java.patch
View file

@ -196,7 +196,7 @@
playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
ServerStatus serverping = this.server.getStatus();
@@ -222,17 +293,77 @@
@@ -222,17 +293,85 @@
player.sendServerStatus(serverping);
}
@ -206,8 +206,18 @@
+ this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
this.playersByUUID.put(player.getUUID(), player);
- this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)));
- this.sendLevelInfo(player, worldserver1);
+ // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below
+
+ // Paper start - Fire PlayerJoinEvent when Player is actually ready; correctly register player BEFORE PlayerJoinEvent, so the entity is valid and doesn't require tick delay hacks
+ player.supressTrackerForLogin = true;
worldserver1.addNewPlayer(player);
- this.server.getCustomBossEvents().onPlayerConnect(player);
- this.sendActivePlayerEffects(player);
+ this.server.getCustomBossEvents().onPlayerConnect(player); // see commented out section below worldserver.addPlayerJoin(entityplayer);
player.loadAndSpawnEnderpearls(optional);
player.loadAndSpawnParentVehicle(optional);
+ // Paper end - Fire PlayerJoinEvent when Player is actually ready
+ // CraftBukkit start
+ CraftPlayer bukkitPlayer = player.getBukkitEntity();
+
@ -246,13 +256,13 @@
+ player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer1)));
+ }
+ player.sentListPacket = true;
+ player.supressTrackerForLogin = false; // Paper - Fire PlayerJoinEvent when Player is actually ready
+ ((ServerLevel)player.level()).getChunkSource().chunkMap.addEntity(player); // Paper - Fire PlayerJoinEvent when Player is actually ready; track entity now
+ // CraftBukkit end
+
+ player.refreshEntityData(player); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
+
this.sendLevelInfo(player, worldserver1);
- worldserver1.addNewPlayer(player);
- this.server.getCustomBossEvents().onPlayerConnect(player);
+ this.sendLevelInfo(player, worldserver1);
+
+ // CraftBukkit start - Only add if the player wasn't moved in the event
+ if (player.level() == worldserver1 && !worldserver1.players().contains(player)) {
@ -262,9 +272,8 @@
+
+ worldserver1 = player.serverLevel(); // CraftBukkit - Update in case join event changed it
+ // CraftBukkit end
this.sendActivePlayerEffects(player);
player.loadAndSpawnEnderpearls(optional);
player.loadAndSpawnParentVehicle(optional);
+ this.sendActivePlayerEffects(player);
+ // Paper - move loading pearls / parent vehicle up
player.initInventoryMenu();
+ // CraftBukkit - Moved from above, added world
+ // Paper start - Configurable player collision; Add to collideRule team if needed
@ -278,7 +287,7 @@
}
public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
@@ -269,30 +400,31 @@
@@ -269,30 +408,31 @@
}
public void addWorldborderListener(ServerLevel world) {
@ -315,7 +324,7 @@
}
@Override
@@ -319,14 +451,15 @@
@@ -319,14 +459,15 @@
}
protected void save(ServerPlayer player) {
@ -333,7 +342,7 @@
if (advancementdataplayer != null) {
advancementdataplayer.save();
@@ -334,95 +467,186 @@
@@ -334,95 +475,186 @@
}
@ -558,7 +567,7 @@
if (entityplayer1 != null) {
set.add(entityplayer1);
@@ -431,72 +655,160 @@
@@ -431,72 +663,160 @@
Iterator iterator1 = set.iterator();
while (iterator1.hasNext()) {
@ -740,7 +749,7 @@
return entityplayer1;
}
@@ -516,15 +828,32 @@
@@ -516,15 +836,32 @@
}
public void sendPlayerPermissionLevel(ServerPlayer player) {
@ -775,7 +784,7 @@
this.sendAllPlayerInfoIn = 0;
}
@@ -541,6 +870,25 @@
@@ -541,6 +878,25 @@
}
@ -801,7 +810,7 @@
public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
Iterator iterator = this.players.iterator();
@@ -554,7 +902,7 @@
@@ -554,7 +910,7 @@
}
@ -810,7 +819,7 @@
PlayerTeam scoreboardteam = source.getTeam();
if (scoreboardteam != null) {
@@ -573,7 +921,7 @@
@@ -573,7 +929,7 @@
}
}
@ -819,7 +828,7 @@
PlayerTeam scoreboardteam = source.getTeam();
if (scoreboardteam == null) {
@@ -619,7 +967,7 @@
@@ -619,7 +975,7 @@
}
public void deop(GameProfile profile) {
@ -828,7 +837,7 @@
ServerPlayer entityplayer = this.getPlayer(profile.getId());
if (entityplayer != null) {
@@ -643,36 +991,51 @@
@@ -643,36 +999,51 @@
player.connection.send(new ClientboundEntityEventPacket(player, b0));
}
@ -893,7 +902,7 @@
if (entityplayer != player && entityplayer.level().dimension() == worldKey) {
double d4 = x - entityplayer.getX();
double d5 = y - entityplayer.getY();
@@ -687,10 +1050,12 @@
@@ -687,10 +1058,12 @@
}
public void saveAll() {
@ -906,7 +915,7 @@
}
public UserWhiteList getWhiteList() {
@@ -712,15 +1077,19 @@
@@ -712,15 +1085,19 @@
public void reloadWhiteList() {}
public void sendLevelInfo(ServerPlayer player, ServerLevel world) {
@ -930,7 +939,7 @@
}
player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0.0F));
@@ -729,8 +1098,16 @@
@@ -729,8 +1106,16 @@
public void sendAllPlayerInfo(ServerPlayer player) {
player.inventoryMenu.sendAllDataToRemote();
@ -948,7 +957,7 @@
}
public int getPlayerCount() {
@@ -746,6 +1123,7 @@
@@ -746,6 +1131,7 @@
}
public void setUsingWhiteList(boolean whitelistEnabled) {
@ -956,7 +965,7 @@
this.doWhiteList = whitelistEnabled;
}
@@ -786,12 +1164,36 @@
@@ -786,11 +1172,35 @@
}
public void removeAll() {
@ -972,30 +981,29 @@
+ for (ServerPlayer player : this.players) {
+ if (isRestarting) player.connection.disconnect(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.restartMessage)); else // Paper
+ player.connection.disconnect(java.util.Objects.requireNonNullElseGet(this.server.server.shutdownMessage(), net.kyori.adventure.text.Component::empty)); // CraftBukkit - add custom shutdown message // Paper - Adventure
}
+ }
+ // CraftBukkit end
+
+ // Paper start - Configurable player collision; Remove collideRule team if it exists
+ if (this.collideRuleTeamName != null) {
+ final net.minecraft.world.scores.Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
+ final PlayerTeam team = scoreboard.getPlayersTeam(this.collideRuleTeamName);
+ if (team != null) scoreboard.removePlayerTeam(team);
+ }
}
+ // Paper end - Configurable player collision
}
+ }
+ // CraftBukkit start
+ public void broadcastMessage(Component[] iChatBaseComponents) {
+ for (Component component : iChatBaseComponents) {
+ this.broadcastSystemMessage(component, false);
+ }
+ }
}
+ // CraftBukkit end
+
public void broadcastSystemMessage(Component message, boolean overlay) {
this.broadcastSystemMessage(message, (entityplayer) -> {
return message;
@@ -819,24 +1221,43 @@
@@ -819,24 +1229,43 @@
}
public void broadcastChatMessage(PlayerChatMessage message, ServerPlayer sender, ChatType.Bound params) {
@ -1042,7 +1050,7 @@
}
if (flag1 && sender != null) {
@@ -845,20 +1266,27 @@
@@ -845,20 +1274,27 @@
}
@ -1075,7 +1083,7 @@
Path path = file2.toPath();
if (FileUtil.isPathNormalized(path) && FileUtil.isPathPortable(path) && path.startsWith(file.getPath()) && file2.isFile()) {
@@ -867,7 +1295,7 @@
@@ -867,7 +1303,7 @@
}
serverstatisticmanager = new ServerStatsCounter(this.server, file1);
@ -1084,7 +1092,7 @@
}
return serverstatisticmanager;
@@ -875,13 +1303,13 @@
@@ -875,13 +1311,13 @@
public PlayerAdvancements getPlayerAdvancements(ServerPlayer player) {
UUID uuid = player.getUUID();
@ -1100,7 +1108,7 @@
}
advancementdataplayer.setPlayer(player);
@@ -932,15 +1360,28 @@
@@ -932,15 +1368,28 @@
}
public void reloadResources() {