Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge in Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-08 12:49:59 -05:00
parent c8a65b216f
commit a32448bda1
140 changed files with 11159 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
patches/server/0044-Mending-mends-most-damages-equipment-first.patch Normal file
View File

@@ -0,0 +1,110 @@
From d57dfeff220bc423b561e2a9f988d93a720422ff Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first
---
.../minecraft/server/EnchantmentManager.java | 25 ++++++++++++++++++-
.../minecraft/server/EntityExperienceOrb.java | 2 +-
.../java/net/minecraft/server/ItemStack.java | 9 +++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 2 ++
4 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
index d96c03a1a..da1cfc1d3 100644
--- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -246,9 +246,32 @@ public class EnchantmentManager {
return getEnchantmentLevel(Enchantments.CHANNELING, itemstack) > 0;
}
+ // Purpur start
+ @Nullable
+ public static Entry<EnumItemSlot, ItemStack> getMostDamagedEquipment(Enchantment enchantment, EntityLiving entityliving) {
+ Map<EnumItemSlot, ItemStack> map = enchantment.a(entityliving);
+ if (map.isEmpty()) {
+ return null;
+ }
+ Entry<EnumItemSlot, ItemStack> item = null;
+ float maxPercent = 0F;
+ for (Entry<EnumItemSlot, ItemStack> entry : map.entrySet()) {
+ ItemStack itemstack = entry.getValue();
+ if (!itemstack.isEmpty() && itemstack.isDamaged() && getEnchantmentLevel(enchantment, itemstack) > 0) {
+ float percent = itemstack.getDamagePercent();
+ if (item == null || percent > maxPercent) {
+ item = entry;
+ maxPercent = percent;
+ }
+ }
+ }
+ return item;
+ }
+ // Purpur end
+
// Paper - OBFHELPER
public static @javax.annotation.Nonnull ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) {
- Entry<EnumItemSlot, ItemStack> entry = b(enchantment, entityliving);
+ Entry<EnumItemSlot, ItemStack> entry = enchantment == Enchantments.MENDING && entityliving.world.purpurConfig.useBetterMending ? getMostDamagedEquipment(enchantment, entityliving) : b(enchantment, entityliving); // Purpur
return entry != null ? entry.getValue() : ItemStack.NULL_ITEM;
}
@Nullable
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 53c6c3389..0fae3693c 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -225,7 +225,7 @@ public class EntityExperienceOrb extends Entity {
if (this.d == 0 && entityhuman.bC == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(((EntityPlayer) entityhuman).getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper
entityhuman.bC = 2;
entityhuman.receive(this, 1);
- Entry<EnumItemSlot, ItemStack> entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman);
+ Entry<EnumItemSlot, ItemStack> entry = world.purpurConfig.useBetterMending ? EnchantmentManager.getMostDamagedEquipment(Enchantments.MENDING, entityhuman) : EnchantmentManager.b(Enchantments.MENDING, entityhuman); // Purpur
if (entry != null) {
ItemStack itemstack = (ItemStack) entry.getValue();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 4730c2beb..4fe503808 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -369,10 +369,19 @@ public final class ItemStack {
}
}
+ public boolean isDamaged() { return f(); } // Purpur - OBFHELPER
public boolean f() {
return this.e() && this.getDamage() > 0;
}
+ public float getDamagePercent() {
+ if (isDamaged()) {
+ return (float) getDamage() / (float) getItem().getMaxDurability();
+ } else {
+ return 0F;
+ }
+ }
+
public int getDamage() {
return this.tag == null ? 0 : this.tag.getInt("Damage");
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3dbcd3f0e..8e6e141dc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -127,6 +127,7 @@ public class PurpurWorldConfig {
public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;
+ public boolean useBetterMending = false;
private void gameplayMechanicsSettings() {
controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
@@ -147,6 +148,7 @@ public class PurpurWorldConfig {
}
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
+ useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
}
public boolean idleTimeoutKick = true;
--
2.24.0