mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
49 lines
2.7 KiB
Diff
49 lines
2.7 KiB
Diff
From 12d28024ebce9ac861c04b078102b7ee39803151 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
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityLiving.java | 2 ++
|
|
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++
|
|
2 files changed, 4 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
index 2128e968ae..76a925f7aa 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -1374,8 +1374,10 @@ public abstract class EntityLiving extends Entity {
|
|
this.dropInventory(); // CraftBukkit - from below
|
|
org.bukkit.event.entity.EntityDeathEvent deathEvent; // Paper
|
|
if (this.isDropExperience() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
|
|
+ if (!(damagesource == DamageSource.CRAMMING && world.purpurConfig.disableDropsOnCrammingDeath)) { // Purpur
|
|
this.a(damagesource, flag);
|
|
this.dropDeathLoot(damagesource, i, flag);
|
|
+ } // Purpur
|
|
// CraftBukkit start - Call death event
|
|
deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
|
|
} else {
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index 05c615bc7d..1941339d96 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -120,6 +120,7 @@ public class PurpurWorldConfig {
|
|
public double controllableMinecartsHopBoost = 0.5D;
|
|
public double controllableMinecartsBaseSpeed = 0.1D;
|
|
public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
|
|
+ public boolean disableDropsOnCrammingDeath = false;
|
|
private void gameplayMechanicsSettings() {
|
|
controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
|
|
controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
|
|
@@ -138,6 +139,7 @@ public class PurpurWorldConfig {
|
|
set("gameplay-mechanics.controllable-minecarts.block-speed.grass-block", 0.3D);
|
|
set("gameplay-mechanics.controllable-minecarts.block-speed.stone", 0.5D);
|
|
}
|
|
+ disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
|
|
}
|
|
|
|
public boolean batRidable = false;
|
|
--
|
|
2.24.0
|
|
|