mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-23 08:49:28 +00:00
Ignore durability change equipment updates
This commit is contained in:
@@ -0,0 +1,39 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: MartijnMuijsers <martijnmuijsers@live.nl>
|
||||||
|
Date: Wed, 30 Nov 2022 15:01:42 +0100
|
||||||
|
Subject: [PATCH] Ignore durability change equipment updates
|
||||||
|
|
||||||
|
License: MIT (https://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
|
This patch is based on the following patch:
|
||||||
|
"Ignore durability change equipment updates"
|
||||||
|
By: Cryptite <cryptite@gmail.com>
|
||||||
|
As part of: Slice (https://github.com/Cryptite/Slice)
|
||||||
|
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
index 5926ea4a5ad74cfaf8a33ad8d14e60e21bae606b..9e39f6098f7a19ffe83a487e2181f3e45396a02a 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||||
|
@@ -3097,7 +3097,7 @@ public abstract class LivingEntity extends Entity {
|
||||||
|
|
||||||
|
ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
|
||||||
|
|
||||||
|
- if (!ItemStack.matches(itemstack1, itemstack)) {
|
||||||
|
+ if (this.level.galeConfig().smallOptimizations.processFullEquipmentChangeIfOnlyDurabilityChanged ? !ItemStack.matches(itemstack1, itemstack) : !ItemStack.isSameIgnoreDurability(itemstack1, itemstack)) { // Gale - Slice - ignore durability change equipment updates
|
||||||
|
// Paper start - PlayerArmorChangeEvent
|
||||||
|
if (this instanceof ServerPlayer && enumitemslot.getType() == EquipmentSlot.Type.ARMOR) {
|
||||||
|
final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack);
|
||||||
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
|
index 345ce3a53e3e7ee5a4dd9a632231edfe161cd821..158897f2500ee9231c0661d015f55e5216b07554 100644
|
||||||
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
|
@@ -33,6 +33,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
|
public SmallOptimizations smallOptimizations;
|
||||||
|
public class SmallOptimizations extends ConfigurationPart {
|
||||||
|
|
||||||
|
+ public boolean processFullEquipmentChangeIfOnlyDurabilityChanged = false; // Gale - Slice - ignore durability change equipment updates
|
||||||
|
+
|
||||||
|
// Gale start - Airplane - reduce projectile chunk loading
|
||||||
|
public MaxProjectileChunkLoads maxProjectileChunkLoads;
|
||||||
|
public class MaxProjectileChunkLoads extends ConfigurationPart {
|
||||||
@@ -30,10 +30,10 @@ index aa3b6f085e370079883d9928962bff8e9b187246..f76a16b40c9d365a618797b7f7bf0993
|
|||||||
|
|
||||||
this.firstTick = false;
|
this.firstTick = false;
|
||||||
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
index 345ce3a53e3e7ee5a4dd9a632231edfe161cd821..02d0697d7ead1383223ac16b5e45e7e6f035f542 100644
|
index 158897f2500ee9231c0661d015f55e5216b07554..4c499898191b2017508b9550e5f769f2d0c97c59 100644
|
||||||
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
||||||
@@ -245,6 +245,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
@@ -247,6 +247,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
||||||
public class GameplayMechanics extends ConfigurationPart {
|
public class GameplayMechanics extends ConfigurationPart {
|
||||||
|
|
||||||
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
|
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
|
||||||
Reference in New Issue
Block a user