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:
2780e94 Fix PaperTickList (#6241)
b854e7e Drop unneeded patch (#6240)
2961b2a Fix various mob drops being captured as death drops (#5675)
3801a39 Add ItemRarity test (#6247)
170382f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
This commit is contained in:
William Blake Galbreath
2021-07-23 10:55:13 -05:00
parent 0dad40ac19
commit dd259870b0
24 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0205-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6972880a375c60d19c03e0988e9ab9f80041d451..010a47813b2b3dbc0739c203e4186d14cc780579 100644
index 5572fe00a915fc31afe3bc7dcf45e894d7cb69b5..c0f97b07f7c0c98699f90f6c2cc6bd67c1fe59ee 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4277,5 +4277,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -89,10 +89,10 @@ index dd88755ac380e5c85d5327d02bc3ec7e06355e49..3df4ca11fc44facd02f358948473d84d
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 eeb8f5413e3dfb88744891255514c65c9fda8fa8..5a2f2743a72d7305c10e5651cfba655551df4ee6 100644
index 9eda9a48fb509f0484576a487a9d0f9cd42574e8..870fb7680e39e1ad69532634a25bb1be664c111c 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1635,17 +1635,7 @@ public abstract class Mob extends LivingEntity {
@@ -1641,17 +1641,7 @@ public abstract class Mob extends LivingEntity {
}
public boolean isSunBurnTick() {
@@ -257,7 +257,7 @@ index c39e2d05fa81279a684532ee796880b1345e8c1c..c44ca111cf8601256bbfb8b6fc959956
public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
// Paper end
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 7eed6c176345c766a99d4304d61d28354291960f..40f2fd62b1d36843c5539932d2fb2496009fee21 100644
index 1f90c40c5e92232c38a33097903fd6e2f6f2ff02..39fa4a9a52c510e88036ab790a8739d20935188b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -96,11 +96,12 @@ public class Zombie extends Monster {
@@ -333,7 +333,7 @@ index 7eed6c176345c766a99d4304d61d28354291960f..40f2fd62b1d36843c5539932d2fb2496
// 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 d79de006a0e636a23419b5be86911d16447f8891..f2ffdb1f515546243dcd388e1bbc43158520d3eb 100644
index 2fb5c5ea01d5f1071c8e8a39e7863ed0640d3fc9..e1513023d7f9701f2c1fde816fa81767af5097dc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1267,5 +1267,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -348,7 +348,7 @@ index d79de006a0e636a23419b5be86911d16447f8891..f2ffdb1f515546243dcd388e1bbc4315
// Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index e0acfc315f80d9a5c5aa045845ccc3e00c4435c5..99ee365536304799082549d48811df436224eb64 100644
index 624f06c50c1e8c938ddc7b4b0ee63d723b0be89b..78154669fa940888de5cf60b7067f9fb34c3a98e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -889,5 +889,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {