mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
7c2dc4b342
* finish implementing all adventure components in codecs * add some initial tests * Add round trip tests for text and translatable components * Add more round trip test data (score component is failing) * Add more round trip test data * Fix SCORE_COMPONENT_MAP_CODEC * Improve test failure messages * Add failure cases * Add a couple more test data * Make use of AdventureCodecs * Update patches after rebase * Squash changes into adventure patch * Fix AT formatting * update comment --------- Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
41 lines
2.2 KiB
Diff
41 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Malfrador <malfrador@gmail.com>
|
|
Date: Wed, 31 May 2023 23:30:00 +0200
|
|
Subject: [PATCH] Add transient modifier API
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
|
|
index 12135ffeacd648f6bc4d7d327059ea1a7e8c79c4..52439f4b959c74027eb191a3af960c70beb978e8 100644
|
|
--- a/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
|
|
+++ b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
|
|
@@ -23,6 +23,11 @@ public class UnmodifiableAttributeInstance extends CraftAttributeInstance {
|
|
throw new UnsupportedOperationException("Cannot modify default attributes");
|
|
}
|
|
|
|
+ @Override
|
|
+ public void addTransientModifier(AttributeModifier modifier) {
|
|
+ throw new UnsupportedOperationException("Cannot modify default attributes");
|
|
+ }
|
|
+
|
|
@Override
|
|
public void removeModifier(AttributeModifier modifier) {
|
|
throw new UnsupportedOperationException("Cannot modify default attributes");
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
|
|
index a88acd3ebc0f11f9b5caca3fbf2401ca5eb3f553..e0faf9bf55f95ab21bd3452cee73196ae7ba8122 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
|
|
@@ -50,6 +50,14 @@ public class CraftAttributeInstance implements AttributeInstance {
|
|
this.handle.addPermanentModifier(CraftAttributeInstance.convert(modifier));
|
|
}
|
|
|
|
+ // Paper start - Transient modifier API
|
|
+ @Override
|
|
+ public void addTransientModifier(AttributeModifier modifier) {
|
|
+ Preconditions.checkArgument(modifier != null, "modifier");
|
|
+ this.handle.addTransientModifier(CraftAttributeInstance.convert(modifier));
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void removeModifier(AttributeModifier modifier) {
|
|
Preconditions.checkArgument(modifier != null, "modifier");
|