Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17: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@c6aa61e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11561)
PaperMC/Paper@93b435d [ci skip] better instructions for patch apply conflict (#11568)
PaperMC/Paper@42a1901 Correctly adopt upstream item EAR fix (#11582)
PaperMC/Paper@fcb6c72 Correctly pass velocity native compressor (#11509)
This commit is contained in:
granny
2024-11-06 18:39:37 -08:00
parent e86a1b6801
commit 962ee3064d
21 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,10 +6,10 @@ 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 96f49fd358ee0cc1c45573638343a1492b32eb83..7b1a5d7a84690865d7263f5c6cd1393d5cc9495e 100644
index 20df4a12d8e5fd5c167f03403d1331d2a0974c00..a78b6d453e59947a70e1c27e1d62efe68d912f88 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -617,6 +617,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -618,6 +618,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
// Purpur end
@@ -33,7 +33,7 @@ index 96f49fd358ee0cc1c45573638343a1492b32eb83..7b1a5d7a84690865d7263f5c6cd1393d
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
this.passengers = ImmutableList.of();
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ab28b28118810a4d55300d5b5590016e318a9720..4c5f573594c53edee96b498fa0852a3dee59cef8 100644
index 305f6bea2ac00b7587091ee10bfd2deca1034412..543eef5062fb77c880905b9b550e5be75893d2db 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -297,6 +297,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -64,7 +64,7 @@ index ab28b28118810a4d55300d5b5590016e318a9720..4c5f573594c53edee96b498fa0852a3d
}
// CraftBukkit start
@@ -3754,6 +3761,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3755,6 +3762,34 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}