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:
PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9414424cb9b9bf1a6ffee2dbb38423055fcc3e9c..3ccac5096d83e21b19dd610a62f37ba21208dac6 100644
index ea51a01e8c8da9c8275c74e3f1e7cf8ab458c687..726909f539a72bebacde7547d8dfabff0a2469e1 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1718,10 +1718,12 @@ public abstract class LivingEntity extends Entity {
@@ -1717,10 +1717,12 @@ public abstract class LivingEntity extends Entity {
this.dropEquipment(); // CraftBukkit - from below
if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -22,7 +22,7 @@ index 9414424cb9b9bf1a6ffee2dbb38423055fcc3e9c..3ccac5096d83e21b19dd610a62f37ba2
// CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 78d2cb224260ebcf48bee46976cddacd69ab38e2..a252c0d92d83eddfc65ecda9cf889b6789f4ee16 100644
index e42af09797a6e0ad976c4f734f1ad714bc377383..eb86bc06b2e7c6c7655d6111de96837ad921cbbb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -94,6 +94,11 @@ public class PurpurWorldConfig {