Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +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@e51401e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347)
PaperMC/Paper@51183af Fix console completer/highlighter having invalid source stack (#8346)
This commit is contained in:
BillyGalbreath
2022-09-10 04:46:02 -05:00
parent 5f14c32a66
commit 664774af5a
16 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0183-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 b889bb03b20129535019a36b73358c51319dc0fd..f6d5d0ebc598d57a5476dbbd47b930d76d27cce7 100644
index 1ffcadeb8750bac1bd2c6aabc0fd93f571f78621..f67fe200b6d748af909593e6cafdedc66cf3c005 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4597,5 +4597,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -275,7 +275,7 @@ index f7689ba01ec6d7f3483be831026e0c5f995459e9..836ca1a47524088c78c6c72a9479c7ff
// 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 f2900d76e9577c83be377500f7d7e7f438a56683..0748babe61be5e5082132af6c4a3bc82612b70b3 100644
index cfecf0322ea22b42fa83bafe3cd2f5d74f0d1311..da2f736bd162a1e2e39473a963ef20bcbb31aa2a 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 {
@@ -351,7 +351,7 @@ index f2900d76e9577c83be377500f7d7e7f438a56683..0748babe61be5e5082132af6c4a3bc82
// 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 240d7cfc0c5f5e3d3c53388f034a1b1faf9a4dfe..be5cadf73ca4e2a2aa490e77ab7747ec8647a2ef 100644
index 7bbddc36be634744c98a4ce1d1e71f2691af4535..8a728818913ec4eae440ef75efa55b84d2b94ccf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -203,6 +203,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -367,10 +367,10 @@ index 240d7cfc0c5f5e3d3c53388f034a1b1faf9a4dfe..be5cadf73ca4e2a2aa490e77ab7747ec
/*
* Order is *EXTREMELY* important -- keep it right! =D
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 9ce256d6e1c3d502888ebe79ae672f2b4b00652e..ab5d668cf295d84663ced382cbde8dc940176470 100644
index 5f56484f3d9351f401a9b297605823689cce57fa..fefed2988a9dc83f4e69d4c667e216b47388b909 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -937,5 +937,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -942,5 +942,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}