Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream ()

Browse Source 
Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
BillyGalbreath
2022-11-13 04:52:10 -06:00
parent f72fd9b28b
commit 85bc4a4a83
18 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.2-R0.1-SNAPSHOT
paperCommit = df5fb9475b9fa9eb4bf1d4840e31f8615fc4f7e3
paperCommit = e22dacf4d2d39cb9d82b127953f9ad24d3e0f695
org.gradle.caching = true
org.gradle.parallel = true

18
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -1749,7 +1749,7 @@ index 8b3e703ebb497b9166bd211b4247a78891b61aeb..94f4a5bfd2af8389a99f80bab4eceac1
this.getRandomBlockPosition(j, 0, k, 15, blockposition);
int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 4ab50df1e4c855587ef030cf3f2a1502798cb721..21c482725d2504b0aedb83ed2a7954b19c11bb61 100644
index 33dd46022be9a4b70ec05c202d9f27b43d09467f..42862061cbd6ca8c34d3fc6ff90145f418becbb9 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1216,6 +1216,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2202,7 +2202,7 @@ index fffa6ba329b38433a1df51df339df652d3fda828..e89b88eb3d4202ea7ff043dc9e921633
this.level.getProfiler().pop();
}
diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
index c770ee21b7b699522941f6a1584d532001c04082..9bce290eb0c2cfef4896a3f2076c80bf3d76bd56 100644
index 692524a69d43dcf52ae1b0f7f593fc53f3878137..59ca3a0a70c68263495ae9972215b76554d3fb83 100644
--- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
@@ -22,9 +22,11 @@ public class AttributeMap {
@@ -2740,7 +2740,7 @@ index d1eefa6ef3e9abfe7af4d8310aa64465fa2d5463..0f4aa330e5b179bb706a31917c671f16
default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
// Paper start - Prevent raytrace from loading chunks
diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e95179896750 100644
index 2c500cfdd594e24b039d698bced1f9f9537722e3..9fa0758c0a8c74dec6cfe8a16585ace1cf45df96 100644
--- a/src/main/java/net/minecraft/world/level/GameRules.java
+++ b/src/main/java/net/minecraft/world/level/GameRules.java
@@ -91,6 +91,7 @@ public class GameRules {
@@ -2952,7 +2952,7 @@ index 596fb8ee21ba8450db13a11890d241ef3974d81d..791411866cabc2c237f40d54250d5a34
}
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 272bdc088f440cf94850dff6e626331b4b5d6539..eceae1230e672d95491405f3f7c550c90ea9b138 100644
index 7c7408b9686c8ff945c30892d45914c60f6c5e4a..a182b3c804cf56855e15290f826fdebdc289a552 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -415,12 +415,12 @@ public final class NaturalSpawner {
@@ -3234,7 +3234,7 @@ index d559f93a9a09bac414dd5d58afccad42c127f09b..13e749a3c40f0b2cc002f13675a9a56e
@Override
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 7350b73f4af4ae347532dc579ab151447c298e09..05f9a828e7c243520b87a77fb34598709aa3525b 100644
index 5e54cf312160e537d2fe6e6fedc618160359330e..39684720c5ee2bb36b8d12cc10e05b7ab8d06172 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -88,6 +88,18 @@ public class LevelChunk extends ChunkAccess {
@@ -3420,7 +3420,7 @@ index 35f9b11a3a61976c952a2c1c64bb2a932538f54f..9e9ac64764cf0a84e25e75d8d6f516cd
public boolean hasParam(LootContextParam<?> parameter) {
diff --git a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59bca4c0518 100644
index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7496a5f25 100644
--- a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
+++ b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
@@ -19,47 +19,66 @@ public class EntityCollisionContext implements CollisionContext {
@@ -3481,12 +3481,12 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
}
@Override
public boolean canStandOnFluid(FluidState state, FluidState fluidState) {
- return this.canStandOnFluid.test(fluidState) && !state.getType().isSame(fluidState.getType());
public boolean canStandOnFluid(FluidState stateAbove, FluidState state) {
- return this.canStandOnFluid.test(state) && !stateAbove.getType().isSame(state.getType());
+ // Pufferfish start
+ Entity entity = this.entity;
+ if (entity instanceof LivingEntity livingEntity) {
+ return livingEntity.canStandOnFluid(fluidState) && !state.getType().isSame(fluidState.getType());
+ return livingEntity.canStandOnFluid(state) && !stateAbove.getType().isSame(state.getType());
+ }
+ return false;
+ // Pufferfish end

4
patches/server/0007-Component-related-conveniences.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a56e79c852eaec4fbd7e428076323b01fda3463b..9091241c21715e2bbe43a11ba637ec7759e7a43a 100644
index f927090ed59b483124076c6d4eed4b55ac5c61d6..836347984b99341a619b919dd82e11666e9ed878 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1709,6 +1709,26 @@ public class ServerPlayer extends Player {
@@ -1711,6 +1711,26 @@ public class ServerPlayer extends Player {
this.lastSentExp = -1; // CraftBukkit - Added to reset
}

8
patches/server/0012-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c347e5df53355b88bf3f69c0d4e95b48678e95dc..9003c702af7763b7fcfea27b2caab1df16d4edc5 100644
index d35eee8011e0c1a8b2885054597cfd88b1192795..e00aa16f51ec065cdce13dff0926d87e49561c8b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2020,8 +2020,58 @@ public class ServerPlayer extends Player {
@@ -2022,8 +2022,58 @@ public class ServerPlayer extends Player {
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();
@@ -68,7 +68,7 @@ index c347e5df53355b88bf3f69c0d4e95b48678e95dc..9003c702af7763b7fcfea27b2caab1df
return this.stats;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index f8c0df22fec9ec08d7346c3d872fa53ff0fa31eb..0d2b7ee97faf4751580eebbf3badbbfe2d0865d0 100644
index e21646cb6975615fb7a76251e5e1c969990c0036..c6448b2281b01aa445f58b289f893c100df01935 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -342,6 +342,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -182,7 +182,7 @@ index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b
if (baseEntity == null) {
if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index f11ba32019abb5d5fef13c8f1beab18f34181a75..74ef0579739cdc6961718dd2d2b34752f172ed73 100644
index 7d0dcb65544ac20faa5dceb5cb97191b06f3800b..265d6b766001cdb8e8b9bc8538119637dd92cd17 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -202,6 +202,13 @@ public abstract class Player extends LivingEntity {

10
patches/server/0019-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 9003c702af7763b7fcfea27b2caab1df16d4edc5..6917b4352cacb9890273c9bf1ea5b8ccc7f069af 100644
index e00aa16f51ec065cdce13dff0926d87e49561c8b..1e50d6abb4ff9337ea3266b131d63a37ffea36c2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -54,7 +54,7 @@ index 9003c702af7763b7fcfea27b2caab1df16d4edc5..6917b4352cacb9890273c9bf1ea5b8cc
return this;
}
}
@@ -2006,6 +2015,7 @@ public class ServerPlayer extends Player {
@@ -2008,6 +2017,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 9003c702af7763b7fcfea27b2caab1df16d4edc5..6917b4352cacb9890273c9bf1ea5b8cc
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2531,9 +2541,17 @@ public class ServerPlayer extends Player {
@@ -2533,9 +2543,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -82,7 +82,7 @@ index 9003c702af7763b7fcfea27b2caab1df16d4edc5..6917b4352cacb9890273c9bf1ea5b8cc
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 0d2b7ee97faf4751580eebbf3badbbfe2d0865d0..9330f5c0c6e1ff852d1446a551baee95fb41226d 100644
index c6448b2281b01aa445f58b289f893c100df01935..abb1a20156b70781ccfd4ce15ffcfa0228b41a7d 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2101,12 +2101,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -108,7 +108,7 @@ index 0d2b7ee97faf4751580eebbf3badbbfe2d0865d0..9330f5c0c6e1ff852d1446a551baee95
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 36a2d51e29bd2d86632516abda56a2466c18e8f8..6fe35f10be757d043a289f85969e64fc03ec38d6 100644
index c8742e5e7fdb89a2239a4fc52e76a19cf367bff6..989f7ad99f52891b40febc6f988f9394a666b442 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1014,6 +1014,8 @@ public abstract class PlayerList {

4
patches/server/0058-Add-player-death-exp-control-options.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add player death exp control options
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 74ef0579739cdc6961718dd2d2b34752f172ed73..df34e5332a6d9c36cad89bac72b5f27892c6192a 100644
index 265d6b766001cdb8e8b9bc8538119637dd92cd17..2f93121c00c36d389958608cf576af3f1cd7e0ab 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1988,9 +1988,18 @@ public abstract class Player extends LivingEntity {
@@ -1997,9 +1997,18 @@ public abstract class Player extends LivingEntity {
@Override
public int getExperienceReward() {
if (!this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) {

4
patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index adb0f93122be4eb944824d90ed06553a246d7cb5..fb80693c653568ff49167e9fef33ea9627409864 100644
index fae43130665255e1b264adc58efeb2a6508efdaa..0c2209c74b70016dd1dab783e3176b046e5dedec 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2600,4 +2600,26 @@ public class ServerPlayer extends Player {
@@ -2602,4 +2602,26 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end

6
patches/server/0124-Implement-TPSBar.patch
View File

@@ -41,7 +41,7 @@ index 24b7ae3253b0710954d4a522114fc0617c0ef3b3..d24216e1d9dcf8e9b68aabd622881a00
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8bbb5a80956a0b25a3ef37351cf57f2646bf8f26..49a828e2c8859352a6a16b1ea43547dbcde1b9ba 100644
index 691ee44d766fee9d47daea138d4589b11d0778cc..02b4c685562c125185387d3842fd0f837a04b020 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 8bbb5a80956a0b25a3ef37351cf57f2646bf8f26..49a828e2c8859352a6a16b1ea43547db
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2630,5 +2633,13 @@ public class ServerPlayer extends Player {
@@ -2632,5 +2635,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
@@ -83,7 +83,7 @@ index 8bbb5a80956a0b25a3ef37351cf57f2646bf8f26..49a828e2c8859352a6a16b1ea43547db
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index ebec09ff2816f5212d032847cf7cde4e4aeef82c..1d369d4a540f4b4731c3a07d2b70256462de34f3 100644
index b59b52702dcfca5a68b7f68dad310a4ec5a41ebe..c620713b8575e95cfddca01a17e8cd08a641753b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -503,6 +503,7 @@ public abstract class PlayerList {

4
patches/server/0142-Config-to-ignore-nearby-mobs-when-sleeping.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 52d0e1b5e461eaf5b1eb412e0adfb52e294af2be..5c094787a446b3947e10c126ef91ad43b78ec99f 100644
index 10260368f1ed23634befc3a3a44033b5cfeb7a7b..1d4db3c4130750de6d13d59ece0713a41bfdbe21 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1345,7 +1345,7 @@ public class ServerPlayer extends Player {
@@ -1347,7 +1347,7 @@ public class ServerPlayer extends Player {
return entitymonster.isPreventingPlayerRest(this);
});

4
patches/server/0176-Add-config-change-multiplier-critical-damage-value.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add config change multiplier critical damage value
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index f10a048d962ff80f566db11a8490e725d4484cb1..45dc5eeb3794492324bd316719524ea797f7ef6a 100644
index 2b2eaac5ebddacada7690219c5ece3e8f2c76a6e..2270ef3d2c0982dda203ae2517b6d9121135637a 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1315,7 +1315,7 @@ public abstract class Player extends LivingEntity {
@@ -1324,7 +1324,7 @@ public abstract class Player extends LivingEntity {
flag2 = flag2 && !level.paperConfig().entities.behavior.disablePlayerCrits; // Paper
flag2 = flag2 && !this.isSprinting();
if (flag2) {

4
patches/server/0187-Flying-Fall-Damage-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 45dc5eeb3794492324bd316719524ea797f7ef6a..bbfb5f8f88e972a770d0ce5373c67ffe29ba0319 100644
index 2270ef3d2c0982dda203ae2517b6d9121135637a..8106457a149d2a28872fc81aba7bb595aa491f21 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -188,6 +188,7 @@ public abstract class Player extends LivingEntity {
@@ -16,7 +16,7 @@ index 45dc5eeb3794492324bd316719524ea797f7ef6a..bbfb5f8f88e972a770d0ce5373c67ffe
// CraftBukkit start
public boolean fauxSleeping;
@@ -1798,7 +1799,7 @@ public abstract class Player extends LivingEntity {
@@ -1807,7 +1808,7 @@ public abstract class Player extends LivingEntity {
@Override
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {

4
patches/server/0189-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Burp delay, burp after eating food fills hunger bar
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index bbfb5f8f88e972a770d0ce5373c67ffe29ba0319..0bcb88b9fc4e7289153177bd71d8a72458af1dbe 100644
index 8106457a149d2a28872fc81aba7bb595aa491f21..89a1959bcc4bc9e086b108714ffc73d57bfb9aec 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -201,6 +201,8 @@ public abstract class Player extends LivingEntity {
@@ -31,7 +31,7 @@ index bbfb5f8f88e972a770d0ce5373c67ffe29ba0319..0bcb88b9fc4e7289153177bd71d8a724
this.noPhysics = this.isSpectator();
if (this.isSpectator()) {
this.onGround = false;
@@ -2364,7 +2372,7 @@ public abstract class Player extends LivingEntity {
@@ -2373,7 +2381,7 @@ public abstract class Player extends LivingEntity {
public ItemStack eat(Level world, ItemStack stack) {
this.getFoodData().eat(stack.getItem(), stack);
this.awardStat(Stats.ITEM_USED.get(stack.getItem()));

4
patches/server/0207-Player-ridable-in-water-option.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player ridable in water option
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index a53b828a23de5cd008504441d1506b29d03261eb..68dc6a007021f8c97530c1d1c4f92cbb7f573661 100644
index f634735add2cd9467ac2d2dae1f8cf06eaa23d0a..f2677acf87e6cc279c902915617ef887799b5f2a 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -2095,6 +2095,11 @@ public abstract class Player extends LivingEntity {
@@ -2104,6 +2104,11 @@ public abstract class Player extends LivingEntity {
return this.inventory.armor;
}

4
patches/server/0209-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 6a044a9c97db9bba75f8dbbaa8515e3167841855..edd378813873ed367784379b0f1666d1
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 0645fcfa8dd201a41588af7a156a0df838ccb006..8639a9772df6a3064b018f1009f95892e646993e 100644
index 5d90bae91c95617fa39ec3eb643c664cc0123bd8..5229555d9e1114e739641c6e5b07ef2ddc97a252 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 0645fcfa8dd201a41588af7a156a0df838ccb006..8639a9772df6a3064b018f1009f95892
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2643,5 +2646,13 @@ public class ServerPlayer extends Player {
@@ -2645,5 +2648,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}

6
patches/server/0237-Signs-allow-color-codes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8639a9772df6a3064b018f1009f95892e646993e..8c83b0fc6d6db5e145ec4c1bcd035e8b06aa37bf 100644
index 5229555d9e1114e739641c6e5b07ef2ddc97a252..ba8bffac6e04c84b2cd621d0ce45c86cdbfeb466 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1520,6 +1520,7 @@ public class ServerPlayer extends Player {
@@ -1522,6 +1522,7 @@ public class ServerPlayer extends Player {
@Override
public void openTextEdit(SignBlockEntity sign) {
@@ -17,7 +17,7 @@ index 8639a9772df6a3064b018f1009f95892e646993e..8c83b0fc6d6db5e145ec4c1bcd035e8b
this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a6ecd212cffa89025dce28d2892fd838a13ec192..0ef0bfaae98a456c3e62f56e81e8518c8d201935 100644
index 5088b44dc0d21fd475418e77e130e1ca904102df..f4d769b3fc2e514308c14805d9cfb297b7b3f912 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3657,11 +3657,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

8
patches/server/0274-Add-log-suppression-for-sent-expired-chat.patch
View File

@@ -5,16 +5,16 @@ Subject: [PATCH] Add log suppression for sent expired chat
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 042434dd91c32f0d89274c3d8eaae267c262e203..32c0c403f44ccfe215a0003c060b131edae72a7c 100644
index f4d769b3fc2e514308c14805d9cfb297b7b3f912..0d0f45160cb5e65ea6b3a8eae953935b45863ec8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2692,7 +2692,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
- if (playerchatmessage.hasExpiredServer(Instant.now())) {
+ if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSentExpiredChat && playerchatmessage.hasExpiredServer(Instant.now())) { // Purpur
ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), playerchatmessage.signedContent().plain(), playerchatmessage.timeStamp().getEpochSecond(), Instant.now().getEpochSecond()); // Paper
- if (message.hasExpiredServer(Instant.now())) {
+ if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSentExpiredChat && message.hasExpiredServer(Instant.now())) { // Purpur
ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), message.signedContent().plain(), message.timeStamp().getEpochSecond(), Instant.now().getEpochSecond()); // Paper
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java

4
patches/server/0299-Implement-ram-and-rambar-commands.patch
View File

@@ -18,7 +18,7 @@ index eb4dac2239592d680ef31edf47f1ab660299762d..1b956c3f50750a00eaf7851112004115
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f3ea3860bda768a8bed4175fd993b708f3ab5de4..467f60dcbed645d773e7e3e042d2bbbd8f5bb589 100644
index 7917c6d10136cc16f95821a6e2f508f3f3c79ad2..14b2c36049c91a8abfc545e2fb5e3d6f908370e8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index f3ea3860bda768a8bed4175fd993b708f3ab5de4..467f60dcbed645d773e7e3e042d2bbbd
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2640,6 +2643,14 @@ public class ServerPlayer extends Player {
@@ -2642,6 +2645,14 @@ public class ServerPlayer extends Player {
}
}

6
patches/server/0301-Fix-MC-123848.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-123848
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
index 2a3ec299283c2cc039877eade6e2ddee8f3812ea..420c13e00ca3e22a101d3867f99fdf2dd30776a8 100644
index 8c09cac6e423f707f1b641c2b3350dcee4372f5f..2edf53d37508acd15bab7730ecb5d9fc0ce18e23 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
@@ -288,6 +288,13 @@ public class ItemFrame extends HangingEntity {
@@ -20,5 +20,5 @@ index 2a3ec299283c2cc039877eade6e2ddee8f3812ea..420c13e00ca3e22a101d3867f99fdf2d
+ // Purpur end
+
private void removeFramedMap(ItemStack itemstack) {
this.getFramedMapId().ifPresent((i) -> {
MapItemSavedData worldmap = MapItem.getSavedData(i, this.level);
// Paper start - fix MC-252817 (green map markers do not disappear)
this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> {