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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@41ab602 [ci skip] couple more fixes for build pr jar label (#8599)
PaperMC/Paper@c40f8d5 Sync offhand slot in menus (#7341)
PaperMC/Paper@425baed Fully deserialise persistent anger post async load (#8560)
PaperMC/Paper@ec6a9a3 Updated Upstream (Bukkit/CraftBukkit) (#8604)
PaperMC/Paper@96fdafd Player Entity Tracking Events (#4722)
PaperMC/Paper@407a445 Fix dumplisteners missing folder creation
PaperMC/Paper@b07d5e0 Limit pet look distance (#8612)
PaperMC/Paper@476ef25 Add missing Fluid type (#8608)
This commit is contained in:
Encode42
2022-12-07 12:05:48 -05:00
parent 86f2da583b
commit 482a83ff9f
21 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -2,7 +2,7 @@ plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.9"
id("io.papermc.paperweight.patcher") version "1.3.11"
}
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.2-R0.1-SNAPSHOT
paperCommit = 54daefa0ca8c89df0046cddb41a11983d305a584
paperCommit = 476ef25d053c523aea416487a38f72011d72a9cf
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -1911,7 +1911,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
int LARGE_MAX_STACK_SIZE = 64;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6fa47becd0f83ac4273ef3a10c314aa27b08184b..249305f0fc4f525fe2d109ecc96900ce3680b1b1 100644
index 22cd5f0e40d7e3cd04793a9dda29d113428fa093..608156f0d8f32d768c424a131c9f8b48fc7e5410 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1997,7 +1997,7 @@ index 6fa47becd0f83ac4273ef3a10c314aa27b08184b..249305f0fc4f525fe2d109ecc96900ce
this.level.getProfiler().push("entityBaseTick");
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
this.feetBlockState = null;
@@ -4019,16 +4053,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4031,16 +4065,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2023,7 +2023,7 @@ index 6fa47becd0f83ac4273ef3a10c314aa27b08184b..249305f0fc4f525fe2d109ecc96900ce
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4036,14 +4072,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4048,14 +4084,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2091,7 +2091,7 @@ index 6fa47becd0f83ac4273ef3a10c314aa27b08184b..249305f0fc4f525fe2d109ecc96900ce
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4065,9 +4148,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4077,9 +4160,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}

6
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 f927090ed59b483124076c6d4eed4b55ac5c61d6..836347984b99341a619b919dd82e11666e9ed878 100644
index 23ef875e9030480ec195572a56248b71d8d4f5cc..74bb1b8f1f7d838bdacdcd127a7ecf8738c02b0f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1711,6 +1711,26 @@ public class ServerPlayer extends Player {
@@ -1718,6 +1718,26 @@ public class ServerPlayer extends Player {
this.lastSentExp = -1; // CraftBukkit - Added to reset
}
@@ -81,7 +81,7 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 249305f0fc4f525fe2d109ecc96900ce3680b1b1..8d52d2fdb98af8d21d3bbea407ff52d3e5eb4ea2 100644
index 608156f0d8f32d768c424a131c9f8b48fc7e5410..395d1109ac367c23b490f7d52b4bdab7cac7f92e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3802,6 +3802,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

8
patches/server/0008-Ridables.patch
View File

@@ -46,10 +46,10 @@ index bdc5dc90dc036a5480dfd776d5e6bf5520d1cc73..503bf34f3c9256ed6f0f31f5396d0bae
final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 836347984b99341a619b919dd82e11666e9ed878..d35eee8011e0c1a8b2885054597cfd88b1192795 100644
index 74bb1b8f1f7d838bdacdcd127a7ecf8738c02b0f..61b9dcda16ee454b102d8a76f3ea6986de7325c0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -674,6 +674,15 @@ public class ServerPlayer extends Player {
@@ -681,6 +681,15 @@ public class ServerPlayer extends Player {
this.trackStartFallingPosition();
this.trackEnteredOrExitedLavaOnVehicle();
this.advancements.flushDirty(this);
@@ -79,7 +79,7 @@ index 15075c8705929de83adaf0f7afe7a7cfd40150ae..6ec78e1efff939755b163ab88405e17b
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
// Paper start
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8d52d2fdb98af8d21d3bbea407ff52d3e5eb4ea2..810e0b92e2090c18806297b8c29d4e539ddde68e 100644
index 395d1109ac367c23b490f7d52b4bdab7cac7f92e..317b8272cede5ba52c04d8960a4440c09d238134 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -119,7 +119,7 @@ index 8d52d2fdb98af8d21d3bbea407ff52d3e5eb4ea2..810e0b92e2090c18806297b8c29d4e53
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4572,4 +4586,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4584,4 +4598,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end

4
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 d35eee8011e0c1a8b2885054597cfd88b1192795..f12a961318810f94c0e4029686885a0291636c1d 100644
index 61b9dcda16ee454b102d8a76f3ea6986de7325c0..1dea5322a07e63f564d506c3255ebb4ee0066b37 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2022,8 +2022,63 @@ public class ServerPlayer extends Player {
@@ -2029,8 +2029,63 @@ public class ServerPlayer extends Player {
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();

14
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 bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f5731310db0c52c 100644
index 1dea5322a07e63f564d506c3255ebb4ee0066b37..f3a90f798f6068e86e1dfd1de49b0fdc074cc7c9 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 {
@@ -16,7 +16,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
@@ -358,6 +359,7 @@ public class ServerPlayer extends Player {
@@ -365,6 +366,7 @@ public class ServerPlayer extends Player {
this.bukkitPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -24,7 +24,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
}
// Yes, this doesn't match Vanilla, but it's the best we can do for now.
@@ -1022,6 +1024,12 @@ public class ServerPlayer extends Player {
@@ -1029,6 +1031,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1029,7 +1037,7 @@ public class ServerPlayer extends Player {
@@ -1036,7 +1044,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -46,7 +46,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1203,6 +1211,7 @@ public class ServerPlayer extends Player {
@@ -1210,6 +1218,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
return this;
}
}
@@ -2008,6 +2017,7 @@ public class ServerPlayer extends Player {
@@ -2015,6 +2024,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f573131
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2538,9 +2548,17 @@ public class ServerPlayer extends Player {
@@ -2545,9 +2555,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {

4
patches/server/0045-Minecart-settings-and-WASD-controls.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6917b4352cacb9890273c9bf1ea5b8ccc7f069af..adb0f93122be4eb944824d90ed06553a246d7cb5 100644
index f3a90f798f6068e86e1dfd1de49b0fdc074cc7c9..c566942d2dc27019cd0a570ac9af4e3d420c2baa 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1035,6 +1035,7 @@ public class ServerPlayer extends Player {
@@ -1042,6 +1042,7 @@ public class ServerPlayer extends Player {
if (this.isInvulnerableTo(source)) {
return false;
} else {

4
patches/server/0060-Add-canSaveToDisk-to-Entity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ece73bc2f6d67dde38bb2b42dd2dcf3bd5806691..6ffeafc0c9ed077a3923d0b2c0540a83e0606942 100644
index f90e07093db36284dff54b5698cce2679d14e110..00c4afae78f8c11a99dc740cf1f30e869b1c160c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4626,5 +4626,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4638,5 +4638,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean processClick(InteractionHand hand) {
return false;
}

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 a78a1568cfc75fcaf4bbb29e9e3fd60829c6c71d..a4b33e2ee40270f86a0eb5d5ba9387a64efa117a 100644
index c566942d2dc27019cd0a570ac9af4e3d420c2baa..43ac7d1d107c110f69464270853ebecb916f23a8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2607,4 +2607,26 @@ public class ServerPlayer extends Player {
@@ -2614,4 +2614,26 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end

4
patches/server/0090-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6ffeafc0c9ed077a3923d0b2c0540a83e0606942..a2a7fa5508c9975449174365299fc6884f51b936 100644
index 00c4afae78f8c11a99dc740cf1f30e869b1c160c..3f9aee2be78358cbeaf5767117d952e7f4ed2a72 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4080,6 +4080,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4092,6 +4092,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.yRotO = this.getYRot();
}

6
patches/server/0114-Add-boat-fall-damage-config.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index fb80693c653568ff49167e9fef33ea9627409864..8bbb5a80956a0b25a3ef37351cf57f2646bf8f26 100644
index 43ac7d1d107c110f69464270853ebecb916f23a8..0e5d361eb5d42036e660946a1cbd9f1cc4b2930f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1035,7 +1035,16 @@ public class ServerPlayer extends Player {
@@ -1042,7 +1042,16 @@ public class ServerPlayer extends Player {
if (this.isInvulnerableTo(source)) {
return false;
} else {
@@ -27,7 +27,7 @@ index fb80693c653568ff49167e9fef33ea9627409864..8bbb5a80956a0b25a3ef37351cf57f26
if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 78bbb55ef2c9370f38253b27f528c6d2e62a7fb3..0671853ed91ad046ad02cbb09188766e7afbaa9d 100644
index 2c1fb29b922b216615f50e5595ca6a53f1be56f8..633f8fa200efe91e7a21a3dc669b29f6474d8a29 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -115,6 +115,7 @@ public class PurpurWorldConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index ab0f00128f8c1b13c3eb5787df0c4e26372e0734..14b12cb6967c1c2735cf6a0eafdf6e23889a528c 100644
index 756153203a1a1cab7ac46b88d5745cd5bc090438..e5e8f39a63f232b73d74c3350aa74bb5569f21c4 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -210,6 +210,7 @@ public class Commands {
@@ -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 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa89337d066b1 100644
index 0e5d361eb5d42036e660946a1cbd9f1cc4b2930f..43e69bcf6910f06bc70f575376e3c4402bfe6837 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 {
@@ -52,7 +52,7 @@ index 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa893
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
@@ -489,6 +490,7 @@ public class ServerPlayer extends Player {
@@ -496,6 +497,7 @@ public class ServerPlayer extends Player {
}
}
@@ -60,7 +60,7 @@ index 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa893
}
@Override
@@ -549,6 +551,7 @@ public class ServerPlayer extends Player {
@@ -556,6 +558,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -68,7 +68,7 @@ index 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa893
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2637,5 +2640,13 @@ public class ServerPlayer extends Player {
@@ -2644,5 +2647,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}

8
patches/server/0134-Fix-stuck-in-portals.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index eaf78967480585b57dece2f791f38609c08339d7..67d466b084b30c57898a6eae773c09daa78ca849 100644
index 43e69bcf6910f06bc70f575376e3c4402bfe6837..236b95fc8dfe0157e5af2b2a20973a9e36b9c604 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1188,6 +1188,7 @@ public class ServerPlayer extends Player {
@@ -1195,6 +1195,7 @@ public class ServerPlayer extends Player {
playerlist.sendPlayerPermissionLevel(this);
worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
this.unsetRemoved();
@@ -17,7 +17,7 @@ index eaf78967480585b57dece2f791f38609c08339d7..67d466b084b30c57898a6eae773c09da
// CraftBukkit end
this.setLevel(worldserver);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5622d3a0732c3006cd9de90b62dec741da0caac4..c8d08fb02eefee08799661423fd4342f05f1b8f2 100644
index a9967badea51c9821957e774d2eee4dfbd285afb..d1d1fb22b75003e53766947ba421073654eed726 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2890,12 +2890,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -37,7 +37,7 @@ index 5622d3a0732c3006cd9de90b62dec741da0caac4..c8d08fb02eefee08799661423fd4342f
this.isInsidePortal = true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 97143ad57276e7f62b50578096972c7581a6158b..4e996becabad942aaaa5ccb097707b0e2fd83adb 100644
index a0591dd2f5b438e04264b4ba9628d85ca0318224..bfe540637ec08d098a3b9e951b2d88fd4f618f1a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -338,6 +338,7 @@ public class PurpurWorldConfig {

6
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 10260368f1ed23634befc3a3a44033b5cfeb7a7b..1d4db3c4130750de6d13d59ece0713a41bfdbe21 100644
index 236b95fc8dfe0157e5af2b2a20973a9e36b9c604..91d327fc77d3b42a48eef06ed4347560fe7f57f9 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1347,7 +1347,7 @@ public class ServerPlayer extends Player {
@@ -1354,7 +1354,7 @@ public class ServerPlayer extends Player {
return entitymonster.isPreventingPlayerRest(this);
});
@@ -18,7 +18,7 @@ index 10260368f1ed23634befc3a3a44033b5cfeb7a7b..1d4db3c4130750de6d13d59ece0713a4
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 63434a7e92dbc10ec957bd14a040997e56944f6e..a1ed00066243e86c796acf49ed830b184e4871c5 100644
index 61757ab81e39741a9f2d3ea6c1c354eb64c992dc..91e1ea30559a28af96aed5cf0f454c5fa782355b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -354,6 +354,7 @@ public class PurpurWorldConfig {

4
patches/server/0169-Configurable-broadcast-settings.patch
View File

@@ -17,10 +17,10 @@ index 897e761be8c1f79562f54101173fbba7656a37ec..ce42e91a95ccd42deff65e1942b918e9
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 5c094787a446b3947e10c126ef91ad43b78ec99f..0645fcfa8dd201a41588af7a156a0df838ccb006 100644
index 91d327fc77d3b42a48eef06ed4347560fe7f57f9..c8f429a7fcfc60783c3667e082b4c4d8a9fc645e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -926,6 +926,7 @@ public class ServerPlayer extends Player {
@@ -933,6 +933,7 @@ public class ServerPlayer extends Player {
}));
Team scoreboardteambase = this.getTeam();

4
patches/server/0182-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a3a76273bb6ce1621366cfd8dec22e5bd3f5c45e..bd76451230bb0b5abb744088b67b7e558a3241a4 100644
index ca31164e78799d9143cc3c791b4b6393e6db4fe5..6e039e35d12101c757c560e6d89f1c1fd97adbd4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4639,5 +4639,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4651,5 +4651,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean canSaveToDisk() {
return true;
}

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add compass command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 6a044a9c97db9bba75f8dbbaa8515e3167841855..edd378813873ed367784379b0f1666d1ccf2194d 100644
index b91ea7354710052be29727e7f62442f316416506..674e2d926608cc4c98068bb83be077864726a515 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -212,6 +212,7 @@ public class Commands {
@@ -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 867373e090865e7de5ece1580e4a99c93dc97c96..0cb1f2e14672eaec16f0334b6a0cd98d3d892d53 100644
index c8f429a7fcfc60783c3667e082b4c4d8a9fc645e..988223d4914a61a56843cdf4cf6dd3d3ace44a37 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 {
@@ -28,7 +28,7 @@ index 867373e090865e7de5ece1580e4a99c93dc97c96..0cb1f2e14672eaec16f0334b6a0cd98d
public boolean isRealPlayer; // Paper
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
@@ -491,6 +492,7 @@ public class ServerPlayer extends Player {
@@ -498,6 +499,7 @@ public class ServerPlayer extends Player {
}
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index 867373e090865e7de5ece1580e4a99c93dc97c96..0cb1f2e14672eaec16f0334b6a0cd98d
}
@Override
@@ -552,6 +554,7 @@ public class ServerPlayer extends Player {
@@ -559,6 +561,7 @@ public class ServerPlayer extends Player {
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index 867373e090865e7de5ece1580e4a99c93dc97c96..0cb1f2e14672eaec16f0334b6a0cd98d
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2650,5 +2653,13 @@ public class ServerPlayer extends Player {
@@ -2657,5 +2660,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}

8
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 5229555d9e1114e739641c6e5b07ef2ddc97a252..ba8bffac6e04c84b2cd621d0ce45c86cdbfeb466 100644
index 988223d4914a61a56843cdf4cf6dd3d3ace44a37..cd1839aaa6ad47f6a129621b9cec9264f4415612 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1522,6 +1522,7 @@ public class ServerPlayer extends Player {
@@ -1529,6 +1529,7 @@ public class ServerPlayer extends Player {
@Override
public void openTextEdit(SignBlockEntity sign) {
@@ -17,7 +17,7 @@ index 5229555d9e1114e739641c6e5b07ef2ddc97a252..ba8bffac6e04c84b2cd621d0ce45c86c
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 5088b44dc0d21fd475418e77e130e1ca904102df..f4d769b3fc2e514308c14805d9cfb297b7b3f912 100644
index 328507baabfefbe5de2b71a33822583af8676687..ec5a1d534ae6a4b41f56bd2a93e37b2fd64ee964 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
@@ -70,7 +70,7 @@ index 58599ead28c25a76d9f41d2d29ee8024c9afdccd..375d449be2ada2b31dafb51cb79c034c
public CompoundTag getUpdateTag() {
return this.saveWithoutMetadata();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2d536be2e7ed910f5e9cad660086efdbf014ad9d..f0d0538c9ea3c3f3119c67c306886dfacbfdc7de 100644
index 1991f6ba4bc282a856513bc304f80242fdbfedb8..2943a6d00d5cc5cbfac00fe7031a473db600606f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -938,8 +938,10 @@ public class PurpurWorldConfig {

14
patches/server/0288-Remove-Mojang-Profiler.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Mojang Profiler
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index edd378813873ed367784379b0f1666d1ccf2194d..eb4dac2239592d680ef31edf47f1ab660299762d 100644
index 674e2d926608cc4c98068bb83be077864726a515..e2a90eed64717ef24b4e1c3dd0b6d90da3ac5eed 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -137,7 +137,7 @@ public class Commands {
@@ -754,10 +754,10 @@ index 7af1b6036fa05533c2e9801988dcf07b51c18f6f..4921c791c7900210e6dd96e03256ea52
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f6032bc75aaad33e183804a7dea5423720e2ae55..d4bebb739d8ff19a610be6775ee25ede4bce2a8c 100644
index cd1839aaa6ad47f6a129621b9cec9264f4415612..5cfed037cda553f4d752770890ae0c9b3f42cbfd 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1157,7 +1157,7 @@ public class ServerPlayer extends Player {
@@ -1164,7 +1164,7 @@ public class ServerPlayer extends Player {
PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
if (shapedetectorshape != null) {
@@ -766,7 +766,7 @@ index f6032bc75aaad33e183804a7dea5423720e2ae55..d4bebb739d8ff19a610be6775ee25ede
worldserver = shapedetectorshape.world; // CraftBukkit
if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
@@ -1180,8 +1180,8 @@ public class ServerPlayer extends Player {
@@ -1187,8 +1187,8 @@ public class ServerPlayer extends Player {
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@@ -777,7 +777,7 @@ index f6032bc75aaad33e183804a7dea5423720e2ae55..d4bebb739d8ff19a610be6775ee25ede
if (true) { // CraftBukkit
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -1200,7 +1200,7 @@ public class ServerPlayer extends Player {
@@ -1207,7 +1207,7 @@ public class ServerPlayer extends Player {
worldserver.addDuringPortalTeleport(this);
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition(); // CraftBukkit - sync position after changing it (from PortalTravelAgent#findAndteleport)
@@ -787,7 +787,7 @@ index f6032bc75aaad33e183804a7dea5423720e2ae55..d4bebb739d8ff19a610be6775ee25ede
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 66c89b3c3668cfc0d427bca85918dbd7fc7089af..7bdc02e997b67c4b579f226ed5ea7f1465dd8546 100644
index 8ec7b5c63b4e5f9ae7cbcfa9a61f9c804f22defc..0c22215733ba8ab12671393301017a40994f1506 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -416,7 +416,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1013,7 +1013,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index bf55ce8f12650037fab0a2133cc1c047a891b5bb..0981acb2a87bb2535a0b447c4f23e14befcc81d3 100644
index b1e609c863ec23d1102d8a032a5cac57664bc2af..de32077569b0f960ac86f6297c8a4a4f6655b707 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -822,7 +822,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

10
patches/server/0298-Implement-ram-and-rambar-commands.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement ram and rambar commands
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index eb4dac2239592d680ef31edf47f1ab660299762d..1b956c3f50750a00eaf7851112004115e9572395 100644
index e2a90eed64717ef24b4e1c3dd0b6d90da3ac5eed..6505112d94ad7d21a71663ae6516c5196abb6531 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -213,6 +213,8 @@ public class Commands {
@@ -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 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3dffb37cb8 100644
index 5cfed037cda553f4d752770890ae0c9b3f42cbfd..bd472130d94ec2a7507a585809fa99047eb60d19 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 {
@@ -29,7 +29,7 @@ index 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3d
private boolean tpsBar = false; // Purpur
private boolean compassBar = false; // Purpur
@@ -491,6 +492,7 @@ public class ServerPlayer extends Player {
@@ -498,6 +499,7 @@ public class ServerPlayer extends Player {
}
}
@@ -37,7 +37,7 @@ index 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3d
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur
}
@@ -553,6 +555,7 @@ public class ServerPlayer extends Player {
@@ -560,6 +562,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -45,7 +45,7 @@ index 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3d
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2647,6 +2650,14 @@ public class ServerPlayer extends Player {
@@ -2654,6 +2657,14 @@ public class ServerPlayer extends Player {
}
}