mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 04:25:26 +01:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
152 lines
6.9 KiB
Diff
152 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/core/Holder;)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..ec9ebd2d539333293c51b7edfa18f18b066d7e43
|
|
--- /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.CraftAttribute;
|
|
+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.core.Holder<net.minecraft.world.entity.ai.attributes.Attribute> nmsAttribute = CraftAttribute.bukkitToMinecraftHolder(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 6855210dc58f455b5af05d9c039da55e8dfc93f1..1dd9a5cc45d5073adb150abdcbe2025e6ed2c315 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
@@ -560,6 +560,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
|
}
|
|
return CraftItemStack.unwrap(itemToBeRepaired).isValidRepairItem(CraftItemStack.unwrap(repairMaterial));
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean hasDefaultEntityAttributes(NamespacedKey bukkitEntityKey) {
|
|
+ return net.minecraft.world.entity.ai.attributes.DefaultAttributes.hasSupplier(net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.getValue(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.getValue(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..fa9fb37993f4025f85dac084efb4b5eda0ede637
|
|
--- /dev/null
|
|
+++ b/src/test/java/io/papermc/paper/attribute/EntityTypeAttributesTest.java
|
|
@@ -0,0 +1,40 @@
|
|
+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.environment.AllFeatures;
|
|
+import org.junit.jupiter.api.Test;
|
|
+
|
|
+import static org.junit.jupiter.api.Assertions.assertFalse;
|
|
+import static org.junit.jupiter.api.Assertions.assertNotNull;
|
|
+import static org.junit.jupiter.api.Assertions.assertThrows;
|
|
+import static org.junit.jupiter.api.Assertions.assertTrue;
|
|
+
|
|
+@AllFeatures
|
|
+public class EntityTypeAttributesTest {
|
|
+
|
|
+ @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.ATTACK_DAMAGE));
|
|
+ AttributeInstance instance = attributable.getAttribute(Attribute.FOLLOW_RANGE);
|
|
+ assertNotNull(instance);
|
|
+ assertThrows(UnsupportedOperationException.class, () -> instance.addModifier(new AttributeModifier("test", 3, AttributeModifier.Operation.ADD_NUMBER)));
|
|
+ assertThrows(UnsupportedOperationException.class, () -> instance.setBaseValue(3.2));
|
|
+ }
|
|
+}
|