Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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:
PaperMC/Paper@848a396 Add mob goal generator (#9980)
PaperMC/Paper@ebf97bd [ci skip] Add more patch identifying comments
PaperMC/Paper@94807a1 [ci skip] Minor cleanup and patch merges
This commit is contained in:
granny
2024-01-16 15:33:16 -08:00
parent 486515bc3c
commit 3d52f066c1
67 changed files with 194 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0078-Totems-work-in-inventory.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index f3d882c889fc6eab2ced0efd0f17404ca6905a5d..1ff77c524464a256913b063bf621b850255885ba 100644
index 55693713ca6a603f074b9526827a704909d619e6..a58e5dc0b1216f7f8cfc93c7a3f967cdd3b70df0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1630,6 +1630,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1631,6 +1631,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}
@@ -28,7 +28,7 @@ index f3d882c889fc6eab2ced0efd0f17404ca6905a5d..1ff77c524464a256913b063bf621b850
EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
event.setCancelled(itemstack == null);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 8f085e8ba40d3bd9fca27b18b9ee156bbffe6bc3..538c6f1cec00ef0ce8e793a5d205875d2d9aac92 100644
index edd6bedd26f82335055580240e71f1d68a79739e..65c365cd330b8865f0aeb7781a8995cbfea62f18 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -243,6 +243,7 @@ public class PurpurWorldConfig {