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@b0ef3ca Only call EntityDamageEvents before actuallyHurt (#11045)
PaperMC/Paper@20889d0 Fix method reflection remapping with null parameter types passed
This commit is contained in:
granny
2024-07-11 08:54:06 +00:00
parent ff19bccd8c
commit b3709b1f4d
12 changed files with 30 additions and 30 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.21-R0.1-SNAPSHOT
mcVersion = 1.21
paperCommit = 70b0e844767131681400b3dbace06c2dea13f87c
paperCommit = 20889d04d8c7a11ff76061d99abcb58acd470fe7
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -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 945da6b82653f05625f054d64bbf605a4ec1cd05..26ba8a5ddd01796c99cc8f1195f5f9ffb397a878 100644
index 909accac7538e1c0c0c51deb2ee0605697c059d0..e9a932358aea57495573fa3923e9ed4a7c93d053 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -237,9 +237,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -223,7 +223,7 @@ index 945da6b82653f05625f054d64bbf605a4ec1cd05..26ba8a5ddd01796c99cc8f1195f5f9ff
@Override
protected void checkFallDamage(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
@@ -3537,8 +3538,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3553,8 +3554,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.pushEntities();
this.level().getProfiler().pop();
// Paper start - Add EntityMoveEvent
@@ -236,7 +236,7 @@ index 945da6b82653f05625f054d64bbf605a4ec1cd05..26ba8a5ddd01796c99cc8f1195f5f9ff
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());
@@ -3548,6 +3551,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3564,6 +3567,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());
}
}

6
patches/server/0039-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ced9c79c0f1f8cb7af9e13062e34725ae2ede47b..2e71f39a37d251f9d0780484776e0f84073d84e3 100644
index 0bb6630133c454bccfe9b4ba8297fb8a1669fc28..54c6666abb8c674f354161489faf06147f4672c6 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1852,7 +1852,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1868,7 +1868,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
boolean flag = this.lastHurtByPlayerTime > 0;
this.dropEquipment(); // CraftBukkit - from below
@@ -18,7 +18,7 @@ index ced9c79c0f1f8cb7af9e13062e34725ae2ede47b..2e71f39a37d251f9d0780484776e0f84
this.dropFromLootTable(damageSource, flag);
// Paper start
final boolean prev = this.clearEquipmentSlots;
@@ -1861,6 +1862,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1877,6 +1878,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
// Paper end
this.dropCustomDeathLoot(world, damageSource, flag);
this.clearEquipmentSlots = prev; // Paper

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

@@ -18,10 +18,10 @@ index bb16b73b6a99ca8fa1b25cc1f8a0aa77c5009d27..04c6736d792f9341e21ff76f0ee8efaf
&& (!(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 2e71f39a37d251f9d0780484776e0f84073d84e3..298ec8aace088d1817a2b4b8b481b5ebfa73949e 100644
index 54c6666abb8c674f354161489faf06147f4672c6..62555037076fe19d80fb0df09c3aa085bfb6a555 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2615,7 +2615,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2631,7 +2631,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Override
protected void onBelowWorld() {

4
patches/server/0053-Dispenser-curse-of-binding-protection.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Dispenser curse of binding protection
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 298ec8aace088d1817a2b4b8b481b5ebfa73949e..a84f45e930751ffbaa60bae47654e50965c44996 100644
index 62555037076fe19d80fb0df09c3aa085bfb6a555..e34fa184655fd42f76ca08a7c289c7cbcfa81122 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -4536,6 +4536,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -4552,6 +4552,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
return EquipmentSlot.MAINHAND;
}

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 a84f45e930751ffbaa60bae47654e50965c44996..43d3bed18fe5d14977cb5ea718f349ef6523e8dd 100644
index e34fa184655fd42f76ca08a7c289c7cbcfa81122..4639b3b47bd29b59ef02364e1773dba5b27cd1ca 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3597,7 +3597,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3613,7 +3613,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
int j = i / 10;
if (j % 2 == 0) {

4
patches/server/0075-Totems-work-in-inventory.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 995cb702af3e3f22d836604db98b333a4939de46..e38c137fbe90f0d024a87031a5610aacbca56c70 100644
index 24d738cf82dc57819064319ad3a9d892167665cc..25915e9e24fc370dac496b7eae6d2f5ac2a0c4c6 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1651,6 +1651,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1667,6 +1667,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}

4
patches/server/0115-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index e38c137fbe90f0d024a87031a5610aacbca56c70..4b53a8a1c5b8ec45f3dc921ef13ee5301e21fa5c 100644
index 25915e9e24fc370dac496b7eae6d2f5ac2a0c4c6..12949e9e713464a8e28cb40647d274cac335381d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1829,7 +1829,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1845,7 +1845,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
boolean flag = false;
if (this.dead && adversary instanceof WitherBoss) { // Paper

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

@@ -33,7 +33,7 @@ index 13afec25f9d08401d9c5adee211e422159f2ba02..0d4eb7fb3a62db8691d49d6963aec7ca
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
this.passengers = ImmutableList.of();
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 51904af3addaf816fecd55a42d2dad2e67aa03f7..5e34a304b0066b238a9381bd35d5f499db54b54b 100644
index c42fa1b5758fee518edb72aefd683d646b2dff3e..e2e0570e1b866ecb2080013df32071fc4d46290f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -286,6 +286,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -64,7 +64,7 @@ index 51904af3addaf816fecd55a42d2dad2e67aa03f7..5e34a304b0066b238a9381bd35d5f499
}
// CraftBukkit start
@@ -3619,6 +3626,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3635,6 +3642,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}

4
patches/server/0187-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 5e34a304b0066b238a9381bd35d5f499db54b54b..b253e87d7d257b546ff4a9c607834d6e26497e8a 100644
index e2e0570e1b866ecb2080013df32071fc4d46290f..387b532cdb17243562f67de4d0dde20b35bd8abb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3022,6 +3022,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3038,6 +3038,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
if (f3 > 0.0F) {
this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);

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

@@ -5,10 +5,10 @@ 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 18341b6453e5690014e260a8aab2219017cc9a91..90cc9ab0b837ec0642b479d7a047931a15bdab2a 100644
index 40a0b2ede7dae5db26c6be12f181e4394669ced3..30149ed40d34818bdbd9098298e8f4cf82116c4c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1563,13 +1563,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1567,13 +1567,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
if (entity1 instanceof net.minecraft.world.entity.player.Player) {
net.minecraft.world.entity.player.Player entityhuman = (net.minecraft.world.entity.player.Player) entity1;

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

@@ -1166,7 +1166,7 @@ index 126f0ddc96193d482ebe00ff157fe08b0a641a9d..badf612b7ef717996037b7eacecd74a7
}
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee00d3b1cfa 100644
index 30149ed40d34818bdbd9098298e8f4cf82116c4c..b4c325979107e0a731d1c955c53b1e76471871ad 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -445,7 +445,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1187,7 +1187,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
}
@Override
@@ -3256,10 +3256,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3272,10 +3272,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1201,7 +1201,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3271,7 +3271,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3287,7 +3287,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1210,7 +1210,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3511,19 +3511,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3527,19 +3527,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1235,7 +1235,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3550,8 +3550,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3566,8 +3566,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1246,7 +1246,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3576,8 +3576,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3592,8 +3592,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1257,7 +1257,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3594,15 +3594,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3610,15 +3610,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}