mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-03 02:20:51 +02:00
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
151 lines
6.9 KiB
Diff
151 lines
6.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 20 Aug 2021 13:03:21 -0700
|
|
Subject: [PATCH] Get entity default attributes
|
|
|
|
== AT ==
|
|
public net.minecraft.world.entity.ai.attributes.AttributeSupplier getAttributeInstance(Lnet/minecraft/world/entity/ai/attributes/Attribute;)Lnet/minecraft/world/entity/ai/attributes/AttributeInstance;
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..12135ffeacd648f6bc4d7d327059ea1a7e8c79c4
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeInstance.java
|
|
@@ -0,0 +1,30 @@
|
|
+package io.papermc.paper.attribute;
|
|
+
|
|
+import net.minecraft.world.entity.ai.attributes.AttributeInstance;
|
|
+import org.bukkit.attribute.Attribute;
|
|
+import org.bukkit.attribute.AttributeModifier;
|
|
+import org.bukkit.craftbukkit.attribute.CraftAttributeInstance;
|
|
+
|
|
+import java.util.Collection;
|
|
+
|
|
+public class UnmodifiableAttributeInstance extends CraftAttributeInstance {
|
|
+
|
|
+ public UnmodifiableAttributeInstance(AttributeInstance handle, Attribute attribute) {
|
|
+ super(handle, attribute);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setBaseValue(double d) {
|
|
+ throw new UnsupportedOperationException("Cannot modify default attributes");
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void addModifier(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/io/papermc/paper/attribute/UnmodifiableAttributeMap.java b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeMap.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..cf9d28ea97d93cec05c9fb768d59e283ca915565
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/attribute/UnmodifiableAttributeMap.java
|
|
@@ -0,0 +1,32 @@
|
|
+package io.papermc.paper.attribute;
|
|
+
|
|
+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
|
|
+import org.bukkit.attribute.Attributable;
|
|
+import org.bukkit.attribute.Attribute;
|
|
+import org.bukkit.attribute.AttributeInstance;
|
|
+import org.bukkit.craftbukkit.attribute.CraftAttributeMap;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+public class UnmodifiableAttributeMap implements Attributable {
|
|
+
|
|
+ private final AttributeSupplier handle;
|
|
+
|
|
+ public UnmodifiableAttributeMap(@NotNull AttributeSupplier handle) {
|
|
+ this.handle = handle;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @Nullable AttributeInstance getAttribute(@NotNull Attribute attribute) {
|
|
+ net.minecraft.world.entity.ai.attributes.Attribute nmsAttribute = CraftAttributeMap.toMinecraft(attribute);
|
|
+ if (!this.handle.hasAttribute(nmsAttribute)) {
|
|
+ return null;
|
|
+ }
|
|
+ return new UnmodifiableAttributeInstance(this.handle.getAttributeInstance(nmsAttribute), attribute);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void registerAttribute(@NotNull Attribute attribute) {
|
|
+ throw new UnsupportedOperationException("Cannot register new attributes here");
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
index 7f870317139db136103cb72b2aa57bcba9f6e793..53e40ab7d37ef707151c165831b24737a9f3683c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
@@ -568,6 +568,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
|
public int getProtocolVersion() {
|
|
return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean hasDefaultEntityAttributes(NamespacedKey bukkitEntityKey) {
|
|
+ return net.minecraft.world.entity.ai.attributes.DefaultAttributes.hasSupplier(net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(bukkitEntityKey)));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public org.bukkit.attribute.Attributable getDefaultEntityAttributes(NamespacedKey bukkitEntityKey) {
|
|
+ Preconditions.checkArgument(hasDefaultEntityAttributes(bukkitEntityKey), bukkitEntityKey + " doesn't have default attributes");
|
|
+ var supplier = net.minecraft.world.entity.ai.attributes.DefaultAttributes.getSupplier((net.minecraft.world.entity.EntityType<? extends net.minecraft.world.entity.LivingEntity>) net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(bukkitEntityKey)));
|
|
+ return new io.papermc.paper.attribute.UnmodifiableAttributeMap(supplier);
|
|
+ }
|
|
// Paper end
|
|
|
|
/**
|
|
diff --git a/src/test/java/io/papermc/paper/attribute/EntityTypeAttributesTest.java b/src/test/java/io/papermc/paper/attribute/EntityTypeAttributesTest.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..7b999deba66aa6d22cd7520f6c13550a44ca327d
|
|
--- /dev/null
|
|
+++ b/src/test/java/io/papermc/paper/attribute/EntityTypeAttributesTest.java
|
|
@@ -0,0 +1,39 @@
|
|
+package io.papermc.paper.attribute;
|
|
+
|
|
+import org.bukkit.attribute.Attributable;
|
|
+import org.bukkit.attribute.Attribute;
|
|
+import org.bukkit.attribute.AttributeInstance;
|
|
+import org.bukkit.attribute.AttributeModifier;
|
|
+import org.bukkit.entity.EntityType;
|
|
+import org.bukkit.support.AbstractTestingBase;
|
|
+import org.junit.Test;
|
|
+
|
|
+import static org.junit.Assert.assertFalse;
|
|
+import static org.junit.Assert.assertNotNull;
|
|
+import static org.junit.Assert.assertThrows;
|
|
+import static org.junit.Assert.assertTrue;
|
|
+
|
|
+public class EntityTypeAttributesTest extends AbstractTestingBase {
|
|
+
|
|
+ @Test
|
|
+ public void testIllegalEntity() {
|
|
+ assertFalse(EntityType.EGG.hasDefaultAttributes());
|
|
+ assertThrows(IllegalArgumentException.class, () -> EntityType.EGG.getDefaultAttributes());
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testLegalEntity() {
|
|
+ assertTrue(EntityType.ZOMBIE.hasDefaultAttributes());
|
|
+ EntityType.ZOMBIE.getDefaultAttributes();
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testUnmodifiabilityOfAttributable() {
|
|
+ Attributable attributable = EntityType.ZOMBIE.getDefaultAttributes();
|
|
+ assertThrows(UnsupportedOperationException.class, () -> attributable.registerAttribute(Attribute.GENERIC_ATTACK_DAMAGE));
|
|
+ AttributeInstance instance = attributable.getAttribute(Attribute.GENERIC_FOLLOW_RANGE);
|
|
+ assertNotNull(instance);
|
|
+ assertThrows(UnsupportedOperationException.class, () -> instance.addModifier(new AttributeModifier("test", 3, AttributeModifier.Operation.ADD_NUMBER)));
|
|
+ assertThrows(UnsupportedOperationException.class, () -> instance.setBaseValue(3.2));
|
|
+ }
|
|
+}
|