twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 10:12:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.20.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-09-22 02:40:00 +10:00
parent 193398c0ff
commit 8a3c8cfcd4
238 changed files with 2448 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
paper-server/nms-patches/net/minecraft/server/level/EntityPlayer.patch
View File

@@ -1,11 +1,10 @@
--- a/net/minecraft/server/level/EntityPlayer.java
+++ b/net/minecraft/server/level/EntityPlayer.java
@@ -155,6 +155,38 @@
@@ -151,6 +151,37 @@
import net.minecraft.world.scores.criteria.IScoreboardCriteria;
import org.slf4j.Logger;
+// CraftBukkit start
+import net.minecraft.core.Position;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.world.damagesource.CombatTracker;
+import net.minecraft.world.food.FoodMetaData;
@@ -39,8 +38,17 @@
public class EntityPlayer extends EntityHuman {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -212,6 +244,21 @@
public int latency;
@@ -185,7 +216,7 @@
private int levitationStartTime;
private boolean disconnected;
private int requestedViewDistance;
- public String language;
+ public String language = "en_us"; // CraftBukkit - default
@Nullable
private Vec3D startingToFallPosition;
@Nullable
@@ -210,6 +241,20 @@
private int containerCounter;
public boolean wonGame;
+ // CraftBukkit start
@@ -54,17 +62,16 @@
+ public double maxHealthCache;
+ public boolean joining = true;
+ public boolean sentListPacket = false;
+ public Integer clientViewDistance;
+ public String kickLeaveMessage = null; // SPIGOT-3034: Forward leave message to PlayerQuitEvent
+ // CraftBukkit end
+
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile) {
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, ClientInformation clientinformation) {
super(worldserver, worldserver.getSharedSpawnPos(), worldserver.getSharedSpawnAngle(), gameprofile);
this.chatVisibility = EnumChatVisibility.FULL;
@@ -274,12 +321,56 @@
this.advancements = minecraftserver.getPlayerList().getPlayerAdvancements(this);
@@ -276,12 +321,56 @@
this.setMaxUpStep(1.0F);
this.fudgeSpawnLocation(worldserver);
this.updateOptions(clientinformation);
+
+ // CraftBukkit start
+ this.displayName = this.getScoreboardName();
@@ -119,7 +126,7 @@
int i = Math.max(0, this.server.getSpawnRadius(worldserver));
int j = MathHelper.floor(worldserver.getWorldBorder().getDistanceToBorder((double) blockposition.getX(), (double) blockposition.getZ()));
@@ -328,7 +419,7 @@
@@ -330,7 +419,7 @@
public void readAdditionalSaveData(NBTTagCompound nbttagcompound) {
super.readAdditionalSaveData(nbttagcompound);
if (nbttagcompound.contains("warden_spawn_tracker", 10)) {
@@ -128,7 +135,7 @@
Logger logger = EntityPlayer.LOGGER;
Objects.requireNonNull(logger);
@@ -347,17 +438,26 @@
@@ -349,17 +438,26 @@
if (nbttagcompound.contains("recipeBook", 10)) {
this.recipeBook.fromNbt(nbttagcompound.getCompound("recipeBook"), this.server.getRecipeManager());
}
@@ -156,7 +163,7 @@
Logger logger1 = EntityPlayer.LOGGER;
Objects.requireNonNull(logger1);
@@ -370,7 +470,7 @@
@@ -372,7 +470,7 @@
@Override
public void addAdditionalSaveData(NBTTagCompound nbttagcompound) {
super.addAdditionalSaveData(nbttagcompound);
@@ -165,7 +172,7 @@
Logger logger = EntityPlayer.LOGGER;
Objects.requireNonNull(logger);
@@ -391,7 +491,20 @@
@@ -393,7 +491,20 @@
Entity entity = this.getRootVehicle();
Entity entity1 = this.getVehicle();
@@ -187,7 +194,7 @@
NBTTagCompound nbttagcompound2 = new NBTTagCompound();
NBTTagCompound nbttagcompound3 = new NBTTagCompound();
@@ -416,8 +529,32 @@
@@ -418,8 +529,32 @@
nbttagcompound.put("SpawnDimension", nbtbase);
});
}
@@ -220,7 +227,7 @@
public void setExperiencePoints(int i) {
float f = (float) this.getXpNeededForNextLevel();
@@ -477,6 +614,11 @@
@@ -479,6 +614,11 @@
@Override
public void tick() {
@@ -232,7 +239,7 @@
this.gameMode.tick();
this.wardenSpawnTracker.tick();
--this.spawnInvulnerableTime;
@@ -533,7 +675,7 @@
@@ -535,7 +675,7 @@
}
if (this.getHealth() != this.lastSentHealth || this.lastSentFood != this.foodData.getFoodLevel() || this.foodData.getSaturationLevel() == 0.0F != this.lastFoodSaturationZero) {
@@ -241,7 +248,7 @@
this.lastSentHealth = this.getHealth();
this.lastSentFood = this.foodData.getFoodLevel();
this.lastFoodSaturationZero = this.foodData.getSaturationLevel() == 0.0F;
@@ -564,6 +706,12 @@
@@ -566,6 +706,12 @@
this.updateScoreForCriteria(IScoreboardCriteria.EXPERIENCE, MathHelper.ceil((float) this.lastRecordedExperience));
}
@@ -254,7 +261,7 @@
if (this.experienceLevel != this.lastRecordedLevel) {
this.lastRecordedLevel = this.experienceLevel;
this.updateScoreForCriteria(IScoreboardCriteria.LEVEL, MathHelper.ceil((float) this.lastRecordedLevel));
@@ -578,6 +726,20 @@
@@ -580,6 +726,20 @@
CriterionTriggers.LOCATION.trigger(this);
}
@@ -275,7 +282,7 @@
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking player");
CrashReportSystemDetails crashreportsystemdetails = crashreport.addCategory("Player being ticked");
@@ -620,7 +782,8 @@
@@ -622,7 +782,8 @@
}
private void updateScoreForCriteria(IScoreboardCriteria iscoreboardcriteria, int i) {
@@ -285,7 +292,7 @@
scoreboardscore.setScore(i);
});
}
@@ -629,9 +792,47 @@
@@ -631,9 +792,47 @@
public void die(DamageSource damagesource) {
this.gameEvent(GameEvent.ENTITY_DIE);
boolean flag = this.level().getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES);
@@ -335,7 +342,7 @@
this.connection.send(new ClientboundPlayerCombatKillPacket(this.getId(), ichatbasecomponent), PacketSendListener.exceptionallySend(() -> {
boolean flag1 = true;
@@ -662,12 +863,18 @@
@@ -664,12 +863,18 @@
if (this.level().getGameRules().getBoolean(GameRules.RULE_FORGIVE_DEAD_PLAYERS)) {
this.tellNeutralMobsThatIDied();
}
@@ -358,7 +365,7 @@
EntityLiving entityliving = this.getKillCredit();
if (entityliving != null) {
@@ -705,10 +912,12 @@
@@ -707,10 +912,12 @@
String s = this.getScoreboardName();
String s1 = entity.getScoreboardName();
@@ -373,7 +380,7 @@
} else {
this.awardStat(StatisticList.MOB_KILLS);
}
@@ -726,7 +935,8 @@
@@ -728,7 +935,8 @@
int i = scoreboardteam.getColor().getId();
if (i >= 0 && i < aiscoreboardcriteria.length) {
@@ -383,7 +390,7 @@
}
}
@@ -776,18 +986,20 @@
@@ -778,18 +986,20 @@
}
private boolean isPvpAllowed() {
@@ -407,7 +414,7 @@
} else {
return shapedetectorshape;
}
@@ -796,11 +1008,20 @@
@@ -798,11 +1008,20 @@
@Nullable
@Override
public Entity changeDimension(WorldServer worldserver) {
@@ -431,7 +438,7 @@
this.unRide();
this.serverLevel().removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
if (!this.wonGame) {
@@ -811,6 +1032,8 @@
@@ -813,6 +1032,8 @@
return this;
} else {
@@ -439,8 +446,8 @@
+ /*
WorldData worlddata = worldserver.getLevelData();
this.connection.send(new PacketPlayOutRespawn(worldserver.dimensionTypeId(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), (byte) 3, this.getLastDeathLocation(), this.getPortalCooldown()));
@@ -820,20 +1043,50 @@
this.connection.send(new PacketPlayOutRespawn(this.createCommonSpawnInfo(worldserver), (byte) 3));
@@ -822,20 +1043,50 @@
playerlist.sendPlayerPermissionLevel(this);
worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
this.unsetRemoved();
@@ -479,7 +486,7 @@
+ if (true) { // CraftBukkit
+ this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
+
+ this.connection.send(new PacketPlayOutRespawn(worldserver.dimensionTypeId(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), (byte) 3, this.getLastDeathLocation(), this.getPortalCooldown()));
+ this.connection.send(new PacketPlayOutRespawn(this.createCommonSpawnInfo(worldserver), (byte) 3));
+ this.connection.send(new PacketPlayOutServerDifficulty(this.level().getDifficulty(), this.level().getLevelData().isDifficultyLocked()));
+ PlayerList playerlist = this.server.getPlayerList();
+
@@ -496,7 +503,7 @@
this.connection.resetPosition();
worldserver.addDuringPortalTeleport(this);
worldserver1.getProfiler().pop();
@@ -853,39 +1106,66 @@
@@ -855,39 +1106,66 @@
this.lastSentExp = -1;
this.lastSentHealth = -1.0F;
this.lastSentFood = -1;
@@ -513,7 +520,7 @@
+ // CraftBukkit start
+ @Override
+ protected CraftPortalEvent callPortalEvent(Entity entity, WorldServer exitWorldServer, Position exitPosition, TeleportCause cause, int searchRadius, int creationRadius) {
+ protected CraftPortalEvent callPortalEvent(Entity entity, WorldServer exitWorldServer, Vec3D exitPosition, TeleportCause cause, int searchRadius, int creationRadius) {
+ Location enter = this.getBukkitEntity().getLocation();
+ Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld(), getYRot(), getXRot());
+ PlayerPortalEvent event = new PlayerPortalEvent(this.getBukkitEntity(), enter, exit, cause, searchRadius, true, creationRadius);
@@ -563,13 +570,13 @@
- Optional<BlockUtil.Rectangle> optional1 = worldserver.getPortalForcer().createPortal(blockposition, enumdirection_enumaxis);
+ Optional<BlockUtil.Rectangle> optional1 = worldserver.getPortalForcer().createPortal(blockposition, enumdirection_enumaxis, this, createRadius); // CraftBukkit
if (!optional1.isPresent()) {
if (optional1.isEmpty()) {
- EntityPlayer.LOGGER.error("Unable to create a portal, likely target out of worldborder");
+ // EntityPlayer.LOGGER.error("Unable to create a portal, likely target out of worldborder"); // CraftBukkit
}
return optional1;
@@ -895,13 +1175,21 @@
@@ -897,13 +1175,21 @@
public void triggerDimensionChangeTriggers(WorldServer worldserver) {
ResourceKey<World> resourcekey = worldserver.dimension();
ResourceKey<World> resourcekey1 = this.level().dimension();
@@ -594,7 +601,7 @@
this.enteredNetherPosition = null;
}
@@ -918,19 +1206,17 @@
@@ -920,19 +1206,17 @@
this.containerMenu.broadcastChanges();
}
@@ -618,7 +625,7 @@
if (this.level().isDay()) {
return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
} else {
@@ -947,7 +1233,36 @@
@@ -949,7 +1233,36 @@
}
}
@@ -656,7 +663,7 @@
this.awardStat(StatisticList.SLEEP_IN_BED);
CriterionTriggers.SLEPT_IN_BED.trigger(this);
});
@@ -960,9 +1275,8 @@
@@ -962,9 +1275,8 @@
return either;
}
}
@@ -667,7 +674,7 @@
}
@Override
@@ -989,13 +1303,31 @@
@@ -991,13 +1303,31 @@
@Override
public void stopSleepInBed(boolean flag, boolean flag1) {
@@ -700,7 +707,7 @@
}
}
@@ -1037,8 +1369,9 @@
@@ -1039,8 +1369,9 @@
this.connection.send(new PacketPlayOutOpenSignEditor(tileentitysign.getBlockPos(), flag));
}
@@ -711,7 +718,7 @@
}
@Override
@@ -1046,13 +1379,35 @@
@@ -1048,13 +1379,35 @@
if (itileinventory == null) {
return OptionalInt.empty();
} else {
@@ -747,7 +754,7 @@
if (container == null) {
if (this.isSpectator()) {
this.displayClientMessage(IChatBaseComponent.translatable("container.spectatorCantOpen").withStyle(EnumChatFormat.RED), true);
@@ -1060,9 +1415,11 @@
@@ -1062,9 +1415,11 @@
return OptionalInt.empty();
} else {
@@ -761,7 +768,7 @@
return OptionalInt.of(this.containerCounter);
}
}
@@ -1075,13 +1432,24 @@
@@ -1077,13 +1432,24 @@
@Override
public void openHorseInventory(EntityHorseAbstract entityhorseabstract, IInventory iinventory) {
@@ -788,7 +795,7 @@
this.initMenu(this.containerMenu);
}
@@ -1104,6 +1472,7 @@
@@ -1106,6 +1472,7 @@
@Override
public void closeContainer() {
@@ -796,7 +803,7 @@
this.connection.send(new PacketPlayOutCloseWindow(this.containerMenu.containerId));
this.doCloseContainer();
}
@@ -1126,6 +1495,16 @@
@@ -1128,6 +1495,16 @@
}
this.jumping = flag;
@@ -813,7 +820,7 @@
this.setShiftKeyDown(flag1);
}
@@ -1134,7 +1513,7 @@
@@ -1136,7 +1513,7 @@
@Override
public void awardStat(Statistic<?> statistic, int i) {
this.stats.increment(this, statistic, i);
@@ -822,7 +829,7 @@
scoreboardscore.add(i);
});
}
@@ -1142,7 +1521,7 @@
@@ -1144,7 +1521,7 @@
@Override
public void resetStat(Statistic<?> statistic) {
this.stats.setValue(this, statistic, 0);
@@ -831,16 +838,16 @@
}
@Override
@@ -1163,7 +1542,7 @@
@@ -1165,7 +1542,7 @@
for (int j = 0; j < i; ++j) {
MinecraftKey minecraftkey = aminecraftkey1[j];
- Optional optional = this.server.getRecipeManager().byKey(minecraftkey);
+ Optional<? extends IRecipe<?>> optional = this.server.getRecipeManager().byKey(minecraftkey); // CraftBukkit - decompile error
+ Optional<? extends RecipeHolder<?>> optional = this.server.getRecipeManager().byKey(minecraftkey); // CraftBukkit - decompile error
Objects.requireNonNull(list);
optional.ifPresent(list::add);
@@ -1198,6 +1577,7 @@
@@ -1200,6 +1577,7 @@
public void resetSentInfo() {
this.lastSentHealth = -1.0E8F;
@@ -848,7 +855,7 @@
}
@Override
@@ -1256,7 +1636,7 @@
@@ -1257,7 +1635,7 @@
this.lastSentExp = -1;
this.lastSentHealth = -1.0F;
this.lastSentFood = -1;
@@ -856,8 +863,8 @@
+ // this.recipeBook.copyOverData(entityplayer.recipeBook); // CraftBukkit
this.seenCredits = entityplayer.seenCredits;
this.enteredNetherPosition = entityplayer.enteredNetherPosition;
this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
@@ -1306,6 +1686,12 @@
this.chunkTrackingView = entityplayer.chunkTrackingView;
@@ -1308,6 +1686,12 @@
@Override
public boolean teleportTo(WorldServer worldserver, double d0, double d1, double d2, Set<RelativeMovement> set, float f, float f1) {
@@ -870,7 +877,7 @@
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(BlockPosition.containing(d0, d1, d2));
worldserver.getChunkSource().addRegionTicket(TicketType.POST_TELEPORT, chunkcoordintpair, 1, this.getId());
@@ -1315,9 +1701,9 @@
@@ -1317,9 +1701,9 @@
}
if (worldserver == this.level()) {
@@ -882,28 +889,24 @@
}
this.setYHeadRot(f);
@@ -1420,7 +1806,20 @@
}
@@ -1423,6 +1807,16 @@
}
+ public String locale = "en_us"; // CraftBukkit - add, lowercase
public void updateOptions(PacketPlayInSettings packetplayinsettings) {
public void updateOptions(ClientInformation clientinformation) {
+ // CraftBukkit start
+ if (getMainArm() != packetplayinsettings.mainHand()) {
+ if (getMainArm() != clientinformation.mainHand()) {
+ PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainArm() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
+ this.server.server.getPluginManager().callEvent(event);
+ }
+ if (!this.locale.equals(packetplayinsettings.language)) {
+ PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(getBukkitEntity(), packetplayinsettings.language);
+ if (!this.language.equals(clientinformation.language())) {
+ PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(getBukkitEntity(), clientinformation.language());
+ this.server.server.getPluginManager().callEvent(event);
+ }
+ this.locale = packetplayinsettings.language;
+ this.clientViewDistance = packetplayinsettings.viewDistance;
+ // CraftBukkit end
this.chatVisibility = packetplayinsettings.chatVisibility();
this.canChatColor = packetplayinsettings.chatColors();
this.textFilteringEnabled = packetplayinsettings.textFilteringEnabled();
@@ -1495,7 +1894,7 @@
this.language = clientinformation.language();
this.requestedViewDistance = clientinformation.viewDistance();
this.chatVisibility = clientinformation.chatVisibility();
@@ -1506,7 +1900,7 @@
if (world instanceof WorldServer) {
WorldServer worldserver = (WorldServer) world;
@@ -912,7 +915,7 @@
}
if (entity != null) {
@@ -1532,7 +1931,7 @@
@@ -1543,7 +1937,7 @@
@Nullable
public IChatBaseComponent getTabListDisplayName() {
@@ -921,7 +924,7 @@
}
@Override
@@ -1553,9 +1952,16 @@
@@ -1564,9 +1958,16 @@
return this.advancements;
}
@@ -938,7 +941,7 @@
if (worldserver == this.level()) {
this.connection.teleport(d0, d1, d2, f, f1);
} else {
@@ -1575,6 +1981,9 @@
@@ -1586,6 +1987,9 @@
this.server.getPlayerList().sendLevelInfo(this, worldserver);
this.server.getPlayerList().sendAllPlayerInfo(this);
}
@@ -948,7 +951,7 @@
}
@@ -1596,6 +2005,32 @@
@@ -1607,6 +2011,32 @@
}
public void setRespawnPosition(ResourceKey<World> resourcekey, @Nullable BlockPosition blockposition, float f, boolean flag, boolean flag1) {
@@ -981,9 +984,9 @@
if (blockposition != null) {
boolean flag2 = blockposition.equals(this.respawnPosition) && resourcekey.equals(this.respawnDimension);
@@ -1805,4 +2240,146 @@
}
@@ -1812,4 +2242,146 @@
public CommonPlayerSpawnInfo createCommonSpawnInfo(WorldServer worldserver) {
return new CommonPlayerSpawnInfo(worldserver.dimensionTypeId(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), this.getLastDeathLocation(), this.getPortalCooldown());
}
+
+ // CraftBukkit start - Add per-player time and weather.

16
paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
View File

@@ -13,7 +13,7 @@
public class EntityTrackerEntry {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -63,8 +69,12 @@
@@ -66,8 +72,12 @@
private boolean wasOnGround;
@Nullable
private List<DataWatcher.b<?>> trackedDataValues;
@@ -27,7 +27,7 @@
this.ap = Vec3D.ZERO;
this.lastPassengers = Collections.emptyList();
this.level = worldserver;
@@ -84,7 +94,7 @@
@@ -87,7 +97,7 @@
List<Entity> list = this.entity.getPassengers();
if (!list.equals(this.lastPassengers)) {
@@ -36,7 +36,7 @@
removedPassengers(list, this.lastPassengers).forEach((entity) -> {
if (entity instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) entity;
@@ -101,18 +111,18 @@
@@ -104,18 +114,18 @@
if (entity instanceof EntityItemFrame) {
EntityItemFrame entityitemframe = (EntityItemFrame) entity;
@@ -59,7 +59,7 @@
worldmap.tickCarriedBy(entityplayer, itemstack);
Packet<?> packet = worldmap.getUpdatePacket(integer, entityplayer);
@@ -225,7 +235,27 @@
@@ -228,7 +238,27 @@
++this.tickCount;
if (this.entity.hurtMarked) {
@@ -88,7 +88,7 @@
this.entity.hurtMarked = false;
}
@@ -253,7 +283,10 @@
@@ -256,7 +286,10 @@
public void sendPairingData(EntityPlayer entityplayer, Consumer<Packet<PacketListenerPlayOut>> consumer) {
if (this.entity.isRemoved()) {
@@ -100,7 +100,7 @@
}
Packet<PacketListenerPlayOut> packet = this.entity.getAddEntityPacket();
@@ -269,6 +302,12 @@
@@ -272,6 +305,12 @@
if (this.entity instanceof EntityLiving) {
Collection<AttributeModifiable> collection = ((EntityLiving) this.entity).getAttributes().getSyncableAttributes();
@@ -113,7 +113,7 @@
if (!collection.isEmpty()) {
consumer.accept(new PacketPlayOutUpdateAttributes(this.entity.getId(), collection));
}
@@ -300,8 +339,15 @@
@@ -303,8 +342,15 @@
if (!list.isEmpty()) {
consumer.accept(new PacketPlayOutEntityEquipment(this.entity.getId(), list));
}
@@ -129,7 +129,7 @@
if (!this.entity.getPassengers().isEmpty()) {
consumer.accept(new PacketPlayOutMount(this.entity));
}
@@ -333,6 +379,11 @@
@@ -338,6 +384,11 @@
Set<AttributeModifiable> set = ((EntityLiving) this.entity).getAttributes().getDirtyAttributes();
if (!set.isEmpty()) {

22
paper-server/nms-patches/net/minecraft/server/level/PlayerChunk.patch
View File

@@ -11,7 +11,7 @@
public class PlayerChunk {
public static final Either<IChunkAccess, PlayerChunk.Failure> UNLOADED_CHUNK = Either.right(PlayerChunk.Failure.UNLOADED);
@@ -71,11 +75,11 @@
@@ -72,12 +76,12 @@
this.fullChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
this.tickingChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
this.entityTickingChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
@@ -21,11 +21,13 @@
this.blockChangedLightSectionFilter = new BitSet();
this.skyChangedLightSectionFilter = new BitSet();
- this.pendingFullStateConfirmation = CompletableFuture.completedFuture((Object) null);
- this.sendSync = CompletableFuture.completedFuture((Object) null);
+ this.pendingFullStateConfirmation = CompletableFuture.completedFuture(null); // CraftBukkit - decompile error
+ this.sendSync = CompletableFuture.completedFuture(null); // CraftBukkit - decompile error
this.pos = chunkcoordintpair;
this.levelHeightAccessor = levelheightaccessor;
this.lightEngine = levellightengine;
@@ -88,6 +92,20 @@
@@ -90,6 +94,20 @@
this.changedBlocksPerSection = new ShortSet[levelheightaccessor.getSectionsCount()];
}
@@ -46,7 +48,7 @@
public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getFutureIfPresentUnchecked(ChunkStatus chunkstatus) {
CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.futures.get(chunkstatus.getIndex());
@@ -113,17 +131,17 @@
@@ -115,9 +133,9 @@
@Nullable
public Chunk getTickingChunk() {
CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture = this.getTickingChunkFuture();
@@ -57,6 +59,8 @@
+ return either == null ? null : (Chunk) either.left().orElse(null); // CraftBukkit - decompile error
}
public CompletableFuture<?> getChunkSendSyncFuture() {
@@ -132,9 +150,9 @@
@Nullable
public Chunk getFullChunk() {
CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture = this.getFullChunkFuture();
@@ -68,7 +72,7 @@
}
@Nullable
@@ -168,6 +186,7 @@
@@ -179,6 +197,7 @@
if (chunk != null) {
int i = this.levelHeightAccessor.getSectionIndex(blockposition.getY());
@@ -76,7 +80,7 @@
if (this.changedBlocksPerSection[i] == null) {
this.hasChangedSections = true;
this.changedBlocksPerSection[i] = new ShortOpenHashSet();
@@ -178,10 +197,10 @@
@@ -189,10 +208,10 @@
}
public void sectionLightChanged(EnumSkyBlock enumskyblock, int i) {
@@ -89,7 +93,7 @@
if (ichunkaccess != null) {
ichunkaccess.setUnsaved(true);
@@ -246,8 +265,11 @@
@@ -257,8 +276,11 @@
PacketPlayOutMultiBlockChange packetplayoutmultiblockchange = new PacketPlayOutMultiBlockChange(sectionposition, shortset, chunksection);
this.broadcast(list, packetplayoutmultiblockchange);
@@ -102,7 +106,7 @@
});
}
}
@@ -372,7 +394,7 @@
@@ -394,7 +416,7 @@
this.pendingFullStateConfirmation = completablefuture1;
completablefuture.thenAccept((either) -> {
either.ifLeft((chunk) -> {
@@ -111,7 +115,7 @@
});
});
}
@@ -389,6 +411,30 @@
@@ -411,6 +433,30 @@
boolean flag1 = ChunkLevel.isLoaded(this.ticketLevel);
FullChunkStatus fullchunkstatus = ChunkLevel.fullStatus(this.oldTicketLevel);
FullChunkStatus fullchunkstatus1 = ChunkLevel.fullStatus(this.ticketLevel);
@@ -142,7 +146,7 @@
if (flag) {
Either<IChunkAccess, PlayerChunk.Failure> either = Either.right(new PlayerChunk.Failure() {
@@ -459,6 +505,26 @@
@@ -481,6 +527,26 @@
this.onLevelChange.onLevelChange(this.pos, this::getQueueLevel, this.ticketLevel, this::setQueueLevel);
this.oldTicketLevel = this.ticketLevel;

32
paper-server/nms-patches/net/minecraft/server/level/PlayerChunkMap.patch
View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/server/level/PlayerChunkMap.java
+++ b/net/minecraft/server/level/PlayerChunkMap.java
@@ -109,6 +109,12 @@
import org.apache.commons.lang3.mutable.MutableObject;
@@ -101,6 +101,12 @@
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.slf4j.Logger;
+// CraftBukkit start
@@ -13,9 +13,9 @@
public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
private static final byte CHUNK_TYPE_REPLACEABLE = -1;
@@ -151,6 +157,27 @@
@@ -143,6 +149,27 @@
private final Queue<Runnable> unloadQueue;
int viewDistance;
private int serverViewDistance;
+ // CraftBukkit start - recursion-safe executor for Chunk loadCallback() and unloadCallback()
+ public final CallbackExecutor callbackExecutor = new CallbackExecutor();
@@ -41,7 +41,7 @@
public PlayerChunkMap(WorldServer worldserver, Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, StructureTemplateManager structuretemplatemanager, Executor executor, IAsyncTaskHandler<Runnable> iasynctaskhandler, ILightAccess ilightaccess, ChunkGenerator chunkgenerator, WorldLoadListener worldloadlistener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier<WorldPersistentData> supplier, int i, boolean flag) {
super(convertable_conversionsession.getDimensionPath(worldserver.dimension()).resolve("region"), datafixer, flag);
this.visibleChunkMap = this.updatingChunkMap.clone();
@@ -169,6 +196,11 @@
@@ -161,6 +188,11 @@
this.storageName = path.getFileName().toString();
this.level = worldserver;
this.generator = chunkgenerator;
@@ -53,7 +53,7 @@
IRegistryCustom iregistrycustom = worldserver.registryAccess();
long j = worldserver.getSeed();
@@ -335,9 +367,12 @@
@@ -332,9 +364,12 @@
CompletableFuture<List<Either<IChunkAccess, PlayerChunk.Failure>>> completablefuture1 = SystemUtils.sequence(list);
CompletableFuture<Either<List<IChunkAccess>, PlayerChunk.Failure>> completablefuture2 = completablefuture1.thenApply((list2) -> {
List<IChunkAccess> list3 = Lists.newArrayList();
@@ -68,7 +68,7 @@
final Either<IChunkAccess, PlayerChunk.Failure> either = (Either) iterator.next();
if (either == null) {
@@ -543,7 +578,7 @@
@@ -540,7 +575,7 @@
private void scheduleUnload(long i, PlayerChunk playerchunk) {
CompletableFuture<IChunkAccess> completablefuture = playerchunk.getChunkToSave();
@@ -77,7 +77,7 @@
CompletableFuture<IChunkAccess> completablefuture1 = playerchunk.getChunkToSave();
if (completablefuture1 != completablefuture) {
@@ -634,9 +669,9 @@
@@ -631,9 +666,9 @@
ProtoChunk protochunk = ChunkRegionLoader.read(this.level, this.poiManager, chunkcoordintpair, (NBTTagCompound) optional.get());
this.markPosition(chunkcoordintpair, protochunk.getStatus().getChunkType());
@@ -89,7 +89,7 @@
}
}, this.mainThreadExecutor).exceptionallyAsync((throwable) -> {
return this.handleChunkLoadFailure(throwable, chunkcoordintpair);
@@ -751,7 +786,21 @@
@@ -748,7 +783,21 @@
private static void postLoadProtoChunk(WorldServer worldserver, List<NBTTagCompound> list) {
if (!list.isEmpty()) {
@@ -112,7 +112,7 @@
}
}
@@ -852,7 +901,7 @@
@@ -860,7 +909,7 @@
if (!playerchunk.wasAccessibleSinceLastSave()) {
return false;
} else {
@@ -121,7 +121,7 @@
if (!(ichunkaccess instanceof ProtoChunkExtension) && !(ichunkaccess instanceof Chunk)) {
return false;
@@ -1014,7 +1063,8 @@
@@ -1017,7 +1066,8 @@
return ichunkaccess instanceof Chunk ? Optional.of((Chunk) ichunkaccess) : Optional.empty();
});
@@ -131,7 +131,7 @@
return chunk.getBlockEntities().size();
}).orElse(0), tickingtracker.getTicketDebugString(i), tickingtracker.getLevel(i), optional1.map((chunk) -> {
return chunk.getBlockTicks().count();
@@ -1027,7 +1077,7 @@
@@ -1030,7 +1080,7 @@
private static String printFuture(CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture) {
try {
@@ -140,7 +140,7 @@
return either != null ? (String) either.map((chunk) -> {
return "done";
@@ -1043,12 +1093,14 @@
@@ -1046,12 +1096,14 @@
private CompletableFuture<Optional<NBTTagCompound>> readChunk(ChunkCoordIntPair chunkcoordintpair) {
return this.read(chunkcoordintpair).thenApplyAsync((optional) -> {
@@ -158,7 +158,7 @@
}
boolean anyPlayerCloseEnoughForSpawning(ChunkCoordIntPair chunkcoordintpair) {
@@ -1503,7 +1555,7 @@
@@ -1460,7 +1512,7 @@
public final Set<ServerPlayerConnection> seenBy = Sets.newIdentityHashSet();
public EntityTracker(Entity entity, int i, int j, boolean flag) {
@@ -167,9 +167,9 @@
this.entity = entity;
this.range = i;
this.lastSectionPos = SectionPosition.of((EntityAccess) entity);
@@ -1562,6 +1614,11 @@
@@ -1520,6 +1572,11 @@
double d2 = d0 * d0;
boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(entityplayer);
boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(entityplayer) && PlayerChunkMap.this.isChunkTracked(entityplayer, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
+ // CraftBukkit start - respect vanish API
+ if (!entityplayer.getBukkitEntity().canSee(this.entity.getBukkitEntity())) {

117
paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
View File

@@ -95,7 +95,7 @@
boolean flag2 = minecraftserver.forceSynchronousWrites();
DataFixer datafixer = minecraftserver.getFixerUpper();
EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver);
@@ -250,9 +304,9 @@
@@ -246,9 +300,9 @@
long l = minecraftserver.getWorldData().worldGenOptions().seed();
this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this.chunkSource.randomState(), this, chunkgenerator.getBiomeSource(), l, datafixer);
@@ -108,15 +108,15 @@
} else {
this.dragonFight = null;
}
@@ -266,6 +320,7 @@
return new RandomSequences(l);
}, "random_sequences");
@@ -258,6 +312,7 @@
this.randomSequences = (RandomSequences) Objects.requireNonNullElseGet(randomsequences, () -> {
return (RandomSequences) this.getDataStorage().computeIfAbsent(RandomSequences.factory(l), "random_sequences");
});
+ this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
}
/** @deprecated */
@@ -304,12 +359,20 @@
@@ -296,12 +351,20 @@
long j;
if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
@@ -140,7 +140,7 @@
if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
this.resetWeatherCycle();
}
@@ -335,7 +398,7 @@
@@ -327,7 +390,7 @@
this.runBlockEvents();
this.handlingTick = false;
gameprofilerfiller.pop();
@@ -149,7 +149,7 @@
if (flag) {
this.resetEmptyTime();
@@ -351,7 +414,7 @@
@@ -343,7 +406,7 @@
this.entityTickList.forEach((entity) -> {
if (!entity.isRemoved()) {
@@ -158,7 +158,7 @@
entity.discard();
} else {
gameprofilerfiller.push("checkDespawn");
@@ -423,7 +486,7 @@
@@ -415,7 +478,7 @@
private void wakeUpAllPlayers() {
this.sleepStatus.removeAllSleepers();
@@ -167,7 +167,7 @@
entityplayer.stopSleepInBed(false, false);
});
}
@@ -451,7 +514,7 @@
@@ -442,7 +505,7 @@
entityhorseskeleton.setTrap(true);
entityhorseskeleton.setAge(0);
entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
@@ -176,7 +176,7 @@
}
}
@@ -460,7 +523,7 @@
@@ -451,7 +514,7 @@
if (entitylightning != null) {
entitylightning.moveTo(Vec3D.atBottomCenterOf(blockposition));
entitylightning.setVisualOnly(flag1);
@@ -185,29 +185,29 @@
}
}
}
@@ -475,7 +538,7 @@
BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition).value();
@@ -506,7 +569,7 @@
BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition1).value();
if (biomebase.shouldFreeze(this, blockposition1)) {
- this.setBlockAndUpdate(blockposition1, Blocks.ICE.defaultBlockState());
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, Blocks.ICE.defaultBlockState(), null); // CraftBukkit
if (biomebase.shouldFreeze(this, blockposition2)) {
- this.setBlockAndUpdate(blockposition2, Blocks.ICE.defaultBlockState());
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition2, Blocks.ICE.defaultBlockState(), null); // CraftBukkit
}
if (flag) {
@@ -522,10 +585,10 @@
IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSnow.LAYERS, j + 1);
Block.pushEntitiesUp(iblockdata, iblockdata1, this, blockposition1);
- this.setBlockAndUpdate(blockposition1, iblockdata1);
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, iblockdata1, null); // CraftBukkit
}
} else {
- this.setBlockAndUpdate(blockposition1, Blocks.SNOW.defaultBlockState());
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, Blocks.SNOW.defaultBlockState(), null); // CraftBukkit
}
}
if (flag) {
@@ -489,10 +552,10 @@
IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSnow.LAYERS, i1 + 1);
Block.pushEntitiesUp(iblockdata, iblockdata1, this, blockposition);
- this.setBlockAndUpdate(blockposition, iblockdata1);
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition, iblockdata1, null); // CraftBukkit
}
} else {
- this.setBlockAndUpdate(blockposition, Blocks.SNOW.defaultBlockState());
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition, Blocks.SNOW.defaultBlockState(), null); // CraftBukkit
}
}
@@ -688,6 +751,7 @@
@@ -686,6 +749,7 @@
this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F);
}
@@ -215,7 +215,7 @@
if (this.oRainLevel != this.rainLevel) {
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
}
@@ -706,14 +770,47 @@
@@ -704,14 +768,47 @@
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel));
this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, this.thunderLevel));
}
@@ -265,7 +265,7 @@
}
public void resetEmptyTime() {
@@ -748,6 +845,7 @@
@@ -746,6 +843,7 @@
});
gameprofilerfiller.incrementCounter("tickNonPassenger");
entity.tick();
@@ -273,7 +273,7 @@
this.getProfiler().pop();
Iterator iterator = entity.getPassengers().iterator();
@@ -771,6 +869,7 @@
@@ -769,6 +867,7 @@
});
gameprofilerfiller.incrementCounter("tickPassenger");
entity1.rideTick();
@@ -281,7 +281,7 @@
gameprofilerfiller.pop();
Iterator iterator = entity1.getPassengers().iterator();
@@ -795,6 +894,7 @@
@@ -793,6 +892,7 @@
ChunkProviderServer chunkproviderserver = this.getChunkSource();
if (!flag1) {
@@ -289,7 +289,7 @@
if (iprogressupdate != null) {
iprogressupdate.progressStartNoAbort(IChatBaseComponent.translatable("menu.savingLevel"));
}
@@ -812,11 +912,19 @@
@@ -810,11 +910,19 @@
}
}
@@ -310,7 +310,7 @@
}
this.getChunkSource().getDataStorage().save();
@@ -881,15 +989,37 @@
@@ -879,15 +987,37 @@
@Override
public boolean addFreshEntity(Entity entity) {
@@ -351,7 +351,7 @@
}
public void addDuringCommandTeleport(EntityPlayer entityplayer) {
@@ -920,24 +1050,37 @@
@@ -918,24 +1048,37 @@
this.entityManager.addNewEntity(entityplayer);
}
@@ -393,7 +393,7 @@
return true;
}
}
@@ -951,10 +1094,32 @@
@@ -949,10 +1092,32 @@
entityplayer.remove(entity_removalreason);
}
@@ -426,7 +426,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -963,6 +1128,12 @@
@@ -961,6 +1126,12 @@
double d1 = (double) blockposition.getY() - entityplayer.getY();
double d2 = (double) blockposition.getZ() - entityplayer.getZ();
@@ -439,7 +439,7 @@
if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
}
@@ -1022,7 +1193,18 @@
@@ -1020,7 +1191,18 @@
Iterator iterator = this.navigatingMobs.iterator();
while (iterator.hasNext()) {
@@ -459,7 +459,7 @@
NavigationAbstract navigationabstract = entityinsentient.getNavigation();
if (navigationabstract.shouldRecomputePath(blockposition)) {
@@ -1084,6 +1266,11 @@
@@ -1082,6 +1264,11 @@
@Override
public Explosion explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, World.a world_a) {
Explosion explosion = this.explode(entity, damagesource, explosiondamagecalculator, d0, d1, d2, f, flag, world_a, false);
@@ -471,7 +471,7 @@
if (!explosion.interactsWithBlocks()) {
explosion.clearToBlow();
@@ -1156,13 +1343,20 @@
@@ -1154,13 +1341,20 @@
}
public <T extends ParticleParam> int sendParticles(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
@@ -494,7 +494,7 @@
++j;
}
}
@@ -1213,7 +1407,7 @@
@@ -1211,7 +1405,7 @@
@Nullable
public BlockPosition findNearestMapStructure(TagKey<Structure> tagkey, BlockPosition blockposition, int i, boolean flag) {
@@ -503,22 +503,7 @@
return null;
} else {
Optional<HolderSet.Named<Structure>> optional = this.registryAccess().registryOrThrow(Registries.STRUCTURE).getTag(tagkey);
@@ -1250,11 +1444,21 @@
@Nullable
@Override
public WorldMap getMapData(String s) {
- return (WorldMap) this.getServer().overworld().getDataStorage().get(WorldMap::load, s);
+ // CraftBukkit start
+ return (WorldMap) this.getServer().overworld().getDataStorage().get((nbttagcompound) -> {
+ // We only get here when the data file exists, but is not a valid map
+ WorldMap newMap = WorldMap.load(nbttagcompound);
+ newMap.id = s;
+ MapInitializeEvent event = new MapInitializeEvent(newMap.mapView);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ return newMap;
+ }, s);
+ // CraftBukkit end
}
@@ -1253,6 +1447,7 @@
@Override
public void setMapData(String s, WorldMap worldmap) {
@@ -526,7 +511,7 @@
this.getServer().overworld().getDataStorage().set(s, worldmap);
}
@@ -1552,6 +1756,11 @@
@@ -1550,6 +1745,11 @@
@Override
public void blockUpdated(BlockPosition blockposition, Block block) {
if (!this.isDebug()) {
@@ -538,7 +523,7 @@
this.updateNeighborsAt(blockposition, block);
}
@@ -1571,12 +1780,12 @@
@@ -1569,12 +1769,12 @@
}
public boolean isFlat() {
@@ -553,7 +538,7 @@
}
@Nullable
@@ -1599,7 +1808,7 @@
@@ -1597,7 +1797,7 @@
private static <T> String getTypeCount(Iterable<T> iterable, Function<T, String> function) {
try {
Object2IntOpenHashMap<String> object2intopenhashmap = new Object2IntOpenHashMap();
@@ -562,7 +547,7 @@
while (iterator.hasNext()) {
T t0 = iterator.next();
@@ -1608,7 +1817,7 @@
@@ -1606,7 +1806,7 @@
object2intopenhashmap.addTo(s, 1);
}
@@ -571,7 +556,7 @@
String s1 = (String) entry.getKey();
return s1 + ":" + entry.getIntValue();
@@ -1619,17 +1828,33 @@
@@ -1617,17 +1817,33 @@
}
public static void makeObsidianPlatform(WorldServer worldserver) {
@@ -607,7 +592,7 @@
}
@Override
@@ -1753,6 +1978,7 @@
@@ -1751,6 +1967,7 @@
}
entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
@@ -615,7 +600,7 @@
}
public void onTrackingEnd(Entity entity) {
@@ -1789,6 +2015,14 @@
@@ -1787,6 +2004,14 @@
}
entity.updateDynamicGameEventListener(DynamicGameEventListener::remove);