Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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:
fb4ff200f4 Use isSensitiveToWater in nerfed check for water-sensitive mobs (#7236)
cee7e0df01 Fix soul speed particles with hide-itemmeta enabled (#7239)
This commit is contained in:
BillyGalbreath
2022-01-01 18:16:15 -06:00
parent 12e0430097
commit 4185c7b462
5 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ index f15cce18d4cfb56d8b54bb8f50af206ad48f8cd1..2673c49e46e0acbac413feec146000d5
// 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 9da2d74f38110abfeaa42ac15b4523dfe7db7e07..953c27e0ea5bc5d38f24cf69d40bb80dcb33da91 100644
index a8702eafb732944d189e386646ed219113c1d811..ea66ac3bbf619feec50e3e73c60f25c14356abbb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity {
@@ -60,7 +60,7 @@ index 9da2d74f38110abfeaa42ac15b4523dfe7db7e07..953c27e0ea5bc5d38f24cf69d40bb80d
}
// CraftBukkit start
@@ -3402,6 +3409,27 @@ public abstract class LivingEntity extends Entity {
@@ -3408,6 +3415,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}
@@ -89,7 +89,7 @@ index 9da2d74f38110abfeaa42ac15b4523dfe7db7e07..953c27e0ea5bc5d38f24cf69d40bb80d
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 1c819db60f278ba902471ae69720f6ff30930886..c0c69fc680b713794bfafe64d356341b80d7c47e 100644
index afb05e183908f720546ace65ddaab45cc2d75525..1d1492f2b705f6d0138b747206a381c8d038c3fa 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1658,17 +1658,7 @@ public abstract class Mob extends LivingEntity {
@@ -333,7 +333,7 @@ index 493f3fe736cef11531d345b076ca240b5feb6ff2..735ecd9d768b9e579142810d5f03093d
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index f16635e4dde9cabf905d450d39c7f84f338b70ad..1ee78cc1f46d3a3493822b19328610a1e43071cc 100644
index e888e630176f30d773155019fb17aed8095538a1..0e3dac205fe9d19ba7dccbd55fcc26ede795c460 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -197,6 +197,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {