Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-14 20:10:05 +01:00
Code Issues Projekte Releases Wiki Aktivität

Do not remove current modifiers

Quellcode durchsuchen 
Do not break API modifier expectations of lasting through death.
Dieser Commit ist enthalten in:
Bjarne Koll 2024-11-10 01:05:33 +01:00
Ursprung bb4c68fa68
Commit ef823cbc25
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 27F6CCCF55D2EE62
1 geänderte Dateien mit 11 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

19
patches/server/1062-Manually-reset-attribute-map-on-restoring-player-ins.patch
Datei anzeigen

@ -16,7 +16,7 @@ protected net.minecraft.world.entity.LivingEntity lastArmorItemStacks
protected net.minecraft.world.entity.LivingEntity lastBodyItemStack protected net.minecraft.world.entity.LivingEntity lastBodyItemStack
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index cffbd3300967e5d80b5973b35a76235bb2aa1b73..40fd2f093363b9436d53cde2831dcb1a78e48121 100644 index cffbd3300967e5d80b5973b35a76235bb2aa1b73..88de7566297b0be7d5f7d8868f76a0b5ac42dfcf 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2285,8 +2285,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -2285,8 +2285,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@ -26,9 +26,9 @@ index cffbd3300967e5d80b5973b35a76235bb2aa1b73..40fd2f093363b9436d53cde2831dcb1a
- this.getAttributes().assignBaseValues(oldPlayer.getAttributes()); - this.getAttributes().assignBaseValues(oldPlayer.getAttributes());
- this.getAttributes().assignPermanentModifiers(oldPlayer.getAttributes()); - this.getAttributes().assignPermanentModifiers(oldPlayer.getAttributes());
+ // Paper start - deal with upstream stupidity around attribute modifiers and recycling entity instances. + // Paper start - deal with upstream stupidity around attribute modifiers and recycling entity instances.
+ //this.getAttributes().assignBaseValues(oldPlayer.getAttributes()); + // this.getAttributes().assignBaseValues(oldPlayer.getAttributes());
+ //this.getAttributes().assignPermanentModifiers(oldPlayer.getAttributes()); + // this.getAttributes().assignPermanentModifiers(oldPlayer.getAttributes());
+ this.getAttributes().removeAllTransientModifiers(); + // this.getAttributes().removeAllTransientModifiers(); Currently not implemented as it would loose API added attribute modifiers, awaiting addition of new API
+ // Paper end + // Paper end
this.setHealth(oldPlayer.getHealth()); this.setHealth(oldPlayer.getHealth());
this.foodData = oldPlayer.foodData; this.foodData = oldPlayer.foodData;
@ -39,21 +39,24 @@ index cffbd3300967e5d80b5973b35a76235bb2aa1b73..40fd2f093363b9436d53cde2831dcb1a
} else { } else {
- this.getAttributes().assignBaseValues(oldPlayer.getAttributes()); - this.getAttributes().assignBaseValues(oldPlayer.getAttributes());
+ // Paper start - deal with upstream stupidity around attribute modifiers and recycling entity instances. + // Paper start - deal with upstream stupidity around attribute modifiers and recycling entity instances.
+ //this.getAttributes().assignBaseValues(oldPlayer.getAttributes()); + // this.getAttributes().assignBaseValues(oldPlayer.getAttributes());
+ this.getAttributes().removeAllModifiers(); + // this.getAttributes().removeAllModifiers(); // Currently not implemented as it would loose API added attribute modifiers, awaiting addition of new API
+ // Paper end + // Paper end
// this.setHealth(this.getMaxHealth()); // CraftBukkit // this.setHealth(this.getMaxHealth()); // CraftBukkit
if (this.serverLevel().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || oldPlayer.isSpectator()) { if (this.serverLevel().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || oldPlayer.isSpectator()) {
this.getInventory().replaceWith(oldPlayer.getInventory()); this.getInventory().replaceWith(oldPlayer.getInventory());
@@ -2328,6 +2334,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -2328,6 +2334,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
this.setShoulderEntityLeft(oldPlayer.getShoulderEntityLeft()); this.setShoulderEntityLeft(oldPlayer.getShoulderEntityLeft());
this.setShoulderEntityRight(oldPlayer.getShoulderEntityRight()); this.setShoulderEntityRight(oldPlayer.getShoulderEntityRight());
this.setLastDeathLocation(oldPlayer.getLastDeathLocation()); this.setLastDeathLocation(oldPlayer.getLastDeathLocation());
+ // Paper start - deal with upstream stupidity around attribute modifiers and recycling entity instances. + // Paper start - deal with upstream stupidity around attribute modifiers and recycling entity instances.
+ /*
+ Currently not implemented as modifiers are *not* actually removed, deviating from vanilla.
+ this.lastArmorItemStacks.clear(); + this.lastArmorItemStacks.clear();
+ this.lastHandItemStacks.clear(); + this.lastHandItemStacks.clear();
+ this.lastBodyItemStack = ItemStack.EMPTY; + this.lastBodyItemStack = ItemStack.EMPTY;
+ this.collectEquipmentChanges(false); + this.skipNextCollectEquipmentEvent = false; // Implement
+ */
+ // Paper end - deal with upstream stupidity around attribute modifiers and recycling entity instances. + // Paper end - deal with upstream stupidity around attribute modifiers and recycling entity instances.
} }