Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@84b5d4a Reorder bukkit damage source entity for explosion (#8553)
PaperMC/Paper@b4c1ae6 Fix MC-121048 (#8429)
PaperMC/Paper@825cb43 [ci skip] Add .fleet/ folder to .gitignore (#8574)
PaperMC/Paper@669fed4 Fix MC-179072 (#8421)
PaperMC/Paper@8f498dc Sync chunk load command improvements (#8554)
PaperMC/Paper@3299886 [ci skip] Add TheFruxz to the license MIT list (#8575)
PaperMC/Paper@0a6f100 Add more collision code skipping logic (#7581)
PaperMC/Paper@76503f8 Strip coordinates from lodestone compasses (#8561)
PaperMC/Paper@b95d4b2 Moving ATs from the at file to individual patches (#8573)
PaperMC/Paper@4a3ae59 [ci skip] Add check for git repo (#8578)
PaperMC/Paper@a7df847 Add Player Warden Warning API (#8470)
PaperMC/Paper@3ab194e Avoid a cubed max search distance for POIs (#8576)
This commit is contained in:
Ben Kerllenevich
2022-11-21 23:26:26 -05:00
parent 79accf69dc
commit 8da783d679
23 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ index b0a3d8f7b1b1ad02e11eede0dd4dd88c75ea93ca..cb51ff789d0de27a3cb81ccb863897e4
// Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index bbeeee00e63b1ab72608d723f828a066d0621aec..d63ac92dce259322bbb5fa6f94ca4c85b7f533eb 100644
index 324ad2c199f2df99248785321e3127a4685a839b..13b912df3d653b8c74e5e9f4bc73790316a2b5c8 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,7 +62,7 @@ index bbeeee00e63b1ab72608d723f828a066d0621aec..d63ac92dce259322bbb5fa6f94ca4c85
}
// CraftBukkit start
@@ -3483,6 +3490,27 @@ public abstract class LivingEntity extends Entity {
@@ -3496,6 +3503,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}
@@ -91,7 +91,7 @@ index bbeeee00e63b1ab72608d723f828a066d0621aec..d63ac92dce259322bbb5fa6f94ca4c85
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 22f4cd68dc7f41441aae803c51adc90eb00e5977..d0c52f9cd2001aa14c04684c24ef32f07e55c905 100644
index 7273474e296618663d3fbba813891197bc8480f8..8c534ea4b461550c14c6d5ee131e5650784c2e0f 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1685,17 +1685,7 @@ public abstract class Mob extends LivingEntity {
@@ -275,7 +275,7 @@ index 6b7baf977972b624c5745820d5c3a4375c6854b0..f032a45969d6835a36e2c7598425bc09
// Paper end
private static enum AttackPhase {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 27b2c48b7c8d82f3971bb6b456c1b1c5fb0266c8..b687f30720a92485d36faec8dcd865ee6cfc6ab9 100644
index 0eaa8119201cae52340a1a58700906eb96e2a99f..f9e6f1788ae5e02372140a40373b4dec31e5d7d3 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -94,11 +94,12 @@ public class Zombie extends Monster {