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 appears to apply and compile correctly

Paper Changes:
aa022fda Fix java cross-version compilation
8b7952a9 Implement alternative item-despawn-rate (#2128)
6ccf0bda Reimplement hopper optimization patch (#2388)
e264c365 MC-156852 fix (#2396)
b6c32b2a Fix recursion in EntityFox (#2418)
7c640a1a Updated Upstream (Bukkit/CraftBukkit/Spigot)  (#2415)
This commit is contained in:
William Blake Galbreath
2019-08-08 18:01:13 -05:00
parent 3935d71fba
commit 2f16d3d43e
17 changed files with 87 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0029-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -1,4 +1,4 @@
From c063618d12d6ab7b40e86dd82bf0fd03c874261c Mon Sep 17 00:00:00 2001
From f445b1fc28a3a5060fc83b4828e9d29a5fc2c421 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 3 Jul 2019 23:58:31 -0500
Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,12 +9,12 @@ Subject: [PATCH] Disable loot drops on death by cramming
2 files changed, 7 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 8b6dd4527..aa60c0084 100644
index 587fe2b36..89e5d01aa 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1420,8 +1420,10 @@ public abstract class EntityLiving extends Entity {
org.bukkit.event.entity.EntityDeathEvent deathEvent = null; // Paper
@@ -1423,8 +1423,10 @@ public abstract class EntityLiving extends Entity {
this.cF(); // CraftBukkit - from below // PAIL
org.bukkit.event.entity.EntityDeathEvent deathEvent; // Paper
if (this.isDropExperience() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
+ if (!(damagesource == DamageSource.CRAMMING && net.pl3x.purpur.PurpurConfig.disableDropsOnCrammingDeath)) { // Purpur - do not drop loot if crammed to death
this.a(damagesource, flag);
@@ -22,7 +22,7 @@ index 8b6dd4527..aa60c0084 100644
+ } // Purpur - do not drop loot if crammed to death
// CraftBukkit start - Call death event
deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
if (!deathEvent.isCancelled()) this.drops = new ArrayList<org.bukkit.inventory.ItemStack>(); // Paper
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 40b28ebe5..412a120e2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java