mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Updated Upstream (Paper)
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user