Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09: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@4d20922 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11024)
PaperMC/Paper@2fa5e0e Fix horse inventories (#11028)
PaperMC/Paper@62ed302 Fix entity distance check when applying knockback

closes #1553
This commit is contained in:
granny
2024-07-07 17:53:09 -07:00
parent de2e7a7967
commit cb0f04bd77
59 changed files with 260 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0121-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -395,10 +395,10 @@ index 751fe2afdea34a6776d428675c3924112668d530..099fd99cf3d455329487fbbf572bb0b2
this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index edf12c4f81f8a113a87b70bf4ab91888fc648cd5..43fcaa66b1c3a53a625aca63c50793e91b97d30f 100644
index 3f182227b84736273c14474cccfea8e9c7441c74..ac35bb9fc72ffc217b006c652b336e57bce62e8f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -220,6 +220,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
@@ -221,6 +221,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
super.tame(player);
}
@@ -625,7 +625,7 @@ index 00c48623e8d53e4a00b9c3e40f6fd2c5af4f61b7..e1db768336872a63a20094ea9058550b
public boolean doHurtTarget(Entity target) {
if (super.doHurtTarget(target)) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index d498b12998f04cf1a4332a358b374d48f8b3b7eb..798d00aae04ba48ca0bbd70ccf3b3e91180d97b4 100644
index 576d8288a9a5e39479623cac6cbf0f2cc81096db..1ce1cf48624d8273dccc571ee37a08c06951acad 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -266,6 +266,11 @@ public class Creeper extends Monster implements PowerableMob {