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@8e6554a Fix sending disconnect packet in phases where it doesn't exist
PaperMC/Paper@06e69c8 Use CommandSourceStack in AsyncPlayerSendCommandsEvent (#10826)
PaperMC/Paper@a47e11d fix knockback events (#10831)
PaperMC/Paper@3181470 Add entity heal API (#10267)
This commit is contained in:
granny
2024-05-30 18:44:08 -07:00
parent b1464f3bf7
commit ee56117c43
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.6-R0.1-SNAPSHOT
mcVersion = 1.20.6
paperCommit = 0fcf3e347f671ce6bdc9699cbe4c34567562dd2b
paperCommit = 3181470ad7d372d2a799c3dcdb61e9392969abe4
org.gradle.caching = true
org.gradle.parallel = true

16
patches/server/0006-Ridables.patch
View File

@@ -79,7 +79,7 @@ index 4ae88bfcead40cd05f9514a48a922a37767cb3cf..ac11226ca4b8d730871851d99491d598
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)) {
entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ffcd965586acc5993c8122336ea2ec661932d4b7..b976ea5d919f73c406adea90603f4a78b761fd25 100644
index 0766292235c04662ce9a5f94d11f9617f563031d..757aeb4b715b17d3f239b495899b0d8874811db8 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -380,7 +380,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -190,7 +190,7 @@ index 09fdea983772612ef3fff6b2da3cf469a34e4ec0..aa76a24421cdb3908a3544d92eb3d1e3
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 0ddf2e1a6d2ea836f8a140a435721e0ce96bd8d2..f790211062a14b5d70dac178c31bfc7033779222 100644
index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..de03ae0d49a9331c6e397c2a26114a935c41b0d8 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -229,9 +229,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -223,7 +223,7 @@ index 0ddf2e1a6d2ea836f8a140a435721e0ce96bd8d2..f790211062a14b5d70dac178c31bfc70
@Override
protected void checkFallDamage(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
@@ -2781,7 +2782,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2771,7 +2772,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
protected long lastJumpTime = 0L; // Paper - Prevent excessive velocity through repeated crits
@@ -232,7 +232,7 @@ index 0ddf2e1a6d2ea836f8a140a435721e0ce96bd8d2..f790211062a14b5d70dac178c31bfc70
float f = this.getJumpPower();
if (f > 1.0E-5F) {
@@ -3494,8 +3495,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3484,8 +3485,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.pushEntities();
this.level().getProfiler().pop();
// Paper start - Add EntityMoveEvent
@@ -245,7 +245,7 @@ index 0ddf2e1a6d2ea836f8a140a435721e0ce96bd8d2..f790211062a14b5d70dac178c31bfc70
Location from = new Location(this.level().getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
Location to = new Location(this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
@@ -3505,6 +3508,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3495,6 +3498,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
}
}
@@ -268,7 +268,7 @@ index 0ddf2e1a6d2ea836f8a140a435721e0ce96bd8d2..f790211062a14b5d70dac178c31bfc70
// Paper end - Add EntityMoveEvent
if (!this.level().isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 9f42563699508fcb3d8a96cfdfc25a7bffd99759..9534ad75d46e2c379a4a850337a6d7568f863f50 100644
index 8b612b772ca87c852d0b108c2afd6785c261c9b9..3fdb1ba2e9249cda6f09406cfbf4cc677a258f13 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -165,8 +165,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -5003,7 +5003,7 @@ index 0854e9b7ee2e6b23b6c1ee6a324a5a253c9d4679..6bdf3d1e3652a661282d61f1dc2bfc27
this.setTradingPlayer(player);
this.openTradingScreen(player, this.getDisplayName(), 1);
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 686374e89e41b0917791264f3281f7384835bca8..1f2ba90a5418d6b4367ebce0f498ebdd204e5b18 100644
index 25595bef64199c4ddbe69c65fd149eec33e778ad..2455ea05bbe00ad939e45d2faa9b7a9a8c932aae 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -206,6 +206,19 @@ public abstract class Player extends LivingEntity {
@@ -5095,7 +5095,7 @@ index a2d336ceb52b63db5c03432ee7bc94dc6a742b82..a6268b3df9691278606501284b5504da
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 1a737167757891794b40575a5db48b0667e23a6b..78b3dde824622ea89ab4446ebb5a965b825ab7de 100644
index dfbe0914ab2771ac632fd064719878ac47559e9f..1a6ab0a29546e39b4df1dc76952488edb0aa6e38 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -592,6 +592,15 @@ public class CraftEventFactory {

6
patches/server/0051-Configurable-void-damage-height-and-damage.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5ebf68635f868c17bc56a3397e3ceed7b7507aa6..e4e240b227fbde9dee03d7a3fa8364e3b129da88 100644
index 8feace82105dccd2db3872a7e735ce376397abc8..90788e4ffdc6f38675aa859e3b2ff185046ac3fc 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -947,7 +947,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -18,10 +18,10 @@ index 5ebf68635f868c17bc56a3397e3ceed7b7507aa6..e4e240b227fbde9dee03d7a3fa8364e3
&& (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
// Paper end - Configurable nether ceiling damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 965fdc5701162aad8656b09c8930448e47db0f3c..7f9b6688066298655d7b722d8d47ad1700326fcb 100644
index 3c023e4c810b7bc3693b944d284f493ccb874253..c0dd4b16056686ad00d82b32e8d73f985b7023b3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2592,7 +2592,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2582,7 +2582,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Override
protected void onBelowWorld() {

4
patches/server/0057-Implement-elytra-settings.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 7f9b6688066298655d7b722d8d47ad1700326fcb..72eb43102ddf8349c4a376ed66ef016dc3bf52eb 100644
index c0dd4b16056686ad00d82b32e8d73f985b7023b3..9cea786b57ed7b7c08bf06783d58945980c62e0f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3554,7 +3554,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3544,7 +3544,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
int j = i / 10;
if (j % 2 == 0) {

4
patches/server/0084-LivingEntity-broadcastItemBreak.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index aa351df679f300018367244c7ccb3e5a59e9276f..11bd76d79bbfff68734d8ee1095f21c5c50e7bde 100644
index 18af8736f30780b48313257a09973e30df6d0e2f..f234cc33ad0e1f308daef6a09e1755bc23497294 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1173,4 +1173,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1180,4 +1180,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
this.getHandle().setYBodyRot(bodyYaw);
}
// Paper end - body yaw API

6
patches/server/0129-One-Punch-Man.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man!
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index dc1c7c55fd13cc1a8ade803bfb1b7c385cf29132..523052af43aa86982d2ded0cc0882d34bac24da7 100644
index 450b289398cb3cccfcddcb4377004358a77d2c45..3a1236048a4cb3fd0efe7343dbc2649bed67dedd 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2382,6 +2382,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2372,6 +2372,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}
@@ -31,7 +31,7 @@ index dc1c7c55fd13cc1a8ade803bfb1b7c385cf29132..523052af43aa86982d2ded0cc0882d34
if (human) {
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3f07fa6eec5efb308d6ec10ddb036c4774031a32..5f01c0d1277e1aa910208a3b9308c427b6e22cdb 100644
index 3a13246c0dccb82ef8168d35d59932911ef2a5ad..b830a673a8c7033147d15d0a63474aa33f5520e6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -344,6 +344,7 @@ public class PurpurWorldConfig {

12
patches/server/0169-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,7 +6,7 @@ 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 126a11c27deb848c86e81ae6e63610c5bb711956..888e44f730725e6dee0a1414a3e75538dda87c14 100644
index 0eea9e29170a365e96659bcea2dea283d6f1ceda..ed2b8138d23e94b5471181396f290c530e29254b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -561,6 +561,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -32,7 +32,7 @@ index 126a11c27deb848c86e81ae6e63610c5bb711956..888e44f730725e6dee0a1414a3e75538
return this.hardCollides;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 7eb32e29ce009b161599196eb28f0dca11dfc548..2fc36b716ce636929e2323651302fd76358dc3e2 100644
index 15f89efd59c7f6334483c67d49e3de6dd03921c9..12f37b245901b84b4cee4e75d38446a554b2274b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -274,6 +274,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -63,7 +63,7 @@ index 7eb32e29ce009b161599196eb28f0dca11dfc548..2fc36b716ce636929e2323651302fd76
}
// CraftBukkit start
@@ -3573,6 +3580,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3563,6 +3570,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}
@@ -92,7 +92,7 @@ index 7eb32e29ce009b161599196eb28f0dca11dfc548..2fc36b716ce636929e2323651302fd76
public boolean isSensitiveToWater() {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 456c3197cc72d63e9c53a768ca7bae45bb1fc722..9d532c373ca1762ad48b9b81000d2c11b929d220 100644
index 3bb977f7b4861c92cf2c036bdf720cf6323964b0..3486c6782f9bbb3477d2fefd1e0a363a5326999f 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1881,17 +1881,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -361,10 +361,10 @@ index befe3372d5f1550b7bde3b63b5e7aef9035c5379..3c674ecd3b80501047b4593e88720342
Preconditions.checkArgument(entity != null, "Unknown entity");
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 54537d1b981d690bc8c5a698fd07425a04070553..d5dfc97f40df7a7161bdaeb04ae6ca5e1a8c8a2b 100644
index f234cc33ad0e1f308daef6a09e1755bc23497294..fbb1b3672af69306c510f3a629bede548ba7a9fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1180,5 +1180,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1187,5 +1187,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}

6
patches/server/0191-Toggle-for-kinetic-damage.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 54a612dd2fcdf6972f7580fbd814f461df07b7f6..549579f2bc2e1fd23ece1ead543e3e5242f52ce0 100644
index 12f37b245901b84b4cee4e75d38446a554b2274b..3e18ca92cdaee1b836d17cddb259ffb683f8ba97 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2993,6 +2993,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2983,6 +2983,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
if (f3 > 0.0F) {
this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);
@@ -17,7 +17,7 @@ index 54a612dd2fcdf6972f7580fbd814f461df07b7f6..549579f2bc2e1fd23ece1ead543e3e52
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 963540e5c3eb6dfbb78b089bba013ef348c8487f..7a2a3243e6d1e22dcbd57674db06bf7cb42abfed 100644
index b66224c74eeb7b60ded96edb08d323002c355db6..36a59f1107a59fc25c48774184ebaba3254a5027 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -182,12 +182,14 @@ public class PurpurWorldConfig {

6
patches/server/0232-Max-joins-per-second.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Max joins per second
When this option is set to true the `max-joins-per-tick` setting in paper.yml will be used per second instead of per tick
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index 02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119..71b021513f30376c7b09d83059deea89cc92385f 100644
index f40420a6841f03983b0837e177ea2ae7c3a37ca1..3b66ecc4f110d0f2dc0ef6c560801296d7e0be64 100644
--- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java
@@ -608,11 +608,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -609,11 +609,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper - Buffer joins to world
private static int joinAttemptsThisTick; // Paper - Buffer joins to world
private static int currTick; // Paper - Buffer joins to world
@@ -31,7 +31,7 @@ index 02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119..71b021513f30376c7b09d83059deea89
}
// Paper end - Buffer joins to world
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 0d6b99822a3a743fe50362702afdca52f6a4a88e..5879af630bc3711a17d51f455585ccd31f7a6d88 100644
index 6884aed8d03ee4da14baeaa5d6eaea54ff53afe5..d0e13dce484c9680128061efaef74555c57ca742 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -456,8 +456,10 @@ public class PurpurConfig {

8
patches/server/0237-Config-for-mob-last-hurt-by-player-time.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config for mob last hurt by player time
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 119d2e57995fa20f34b88963b93c945ff87e0cab..36022a0ab50655363d26be7dba765e2261baccdf 100644
index 2257f14e5abf775cad3d5e0d2a8f6736c72f41cb..2fa0404f4f4a332248cdf7e84f2d9723dda7df8b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1561,13 +1561,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -25,10 +25,10 @@ index 119d2e57995fa20f34b88963b93c945ff87e0cab..36022a0ab50655363d26be7dba765e22
if (entityliving2 instanceof net.minecraft.world.entity.player.Player) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 1a8a76aa31bd1d1670be6e9cada162c540084cf9..b452ebbe11145987fb5e66b39993898457322080 100644
index fbb1b3672af69306c510f3a629bede548ba7a9fd..1284c941a4c863c287098a0a04efcc723e727bb3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -505,7 +505,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -512,7 +512,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
net.minecraft.server.level.ServerPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle();
getHandle().lastHurtByPlayer = entityPlayer;
getHandle().lastHurtByMob = entityPlayer;
@@ -38,7 +38,7 @@ index 1a8a76aa31bd1d1670be6e9cada162c540084cf9..b452ebbe11145987fb5e66b399938984
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 05307f584d96b95e9b81239316a256310422c039..389aac3c02c16bbfe3f266e66e53f6107b27e4dd 100644
index bb4763d6200cdb99a37ce3af58362ae434e3aea9..d7fdefb27ae9361b631d29c61e82aff913814e92 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -143,6 +143,7 @@ public class PurpurWorldConfig {

24
patches/server/0255-Remove-Mojang-Profiler.patch
View File

@@ -1085,7 +1085,7 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 13f69b9ceb082a013dfe2de2d5807dde77d53a2f..57aa9f71a3b27073f3e229ecd342c52546d151b3 100644
index d42cf771b9cf77304d5174f374c56eb793fc2991..45e06ec0e975973edb4434f64ddfc0f663ca3c31 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -896,7 +896,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1211,7 +1211,7 @@ index 13f69b9ceb082a013dfe2de2d5807dde77d53a2f..57aa9f71a3b27073f3e229ecd342c525
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199dbf71212f8 100644
index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad087ac4c90b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1232,7 +1232,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3227,10 +3227,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3217,10 +3217,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1246,7 +1246,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3242,7 +3242,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3232,7 +3232,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1255,7 +1255,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3465,19 +3465,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3455,19 +3455,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1280,7 +1280,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3504,8 +3504,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3494,8 +3494,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1291,7 +1291,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3530,8 +3530,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3520,8 +3520,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1302,7 +1302,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3548,15 +3548,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3538,15 +3538,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}
@@ -1322,7 +1322,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 9d532c373ca1762ad48b9b81000d2c11b929d220..429d8b09496d7d6ffc5f44dca953d6194683813b 100644
index 3486c6782f9bbb3477d2fefd1e0a363a5326999f..6cb17876fc0efaf15ab9f54e4c95b9b858b0a5ee 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -376,13 +376,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -1812,10 +1812,10 @@ index dcf580d852ede8ea01f5d91944a224ec6eca73e4..4be218129188c1be8736940170a861ad
this.assignProfessionWhenSpawned = false;
}
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 082b804f4793f72e76361f5427f0358273454b3d..bd5fcb028d41b60de183b4d849f1ba10746fa0d0 100644
index 638447e8cb74b26f4f8e3862c2fb4a3048979ebc..2e2461b585d9008f1bbb90f9b45e2a1ad837dbd6 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -681,7 +681,7 @@ public class Explosion {
@@ -668,7 +668,7 @@ public class Explosion {
}
if (flag1) {
@@ -1824,7 +1824,7 @@ index 082b804f4793f72e76361f5427f0358273454b3d..bd5fcb028d41b60de183b4d849f1ba10
List<Pair<ItemStack, BlockPos>> list = new ArrayList();
Util.shuffle(this.toBlow, this.level.random);
@@ -759,7 +759,7 @@ public class Explosion {
@@ -746,7 +746,7 @@ public class Explosion {
Block.popResource(this.level, (BlockPos) pair.getSecond(), (ItemStack) pair.getFirst());
}