c0936a71bd
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
74 Zeilen
3.1 KiB
Diff
74 Zeilen
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
|
Date: Wed, 15 Sep 2021 20:40:51 +0200
|
|
Subject: [PATCH] Friction API
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/entity/Frictional.java b/src/main/java/io/papermc/paper/entity/Frictional.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..6eb88c664d873506372ad14075bfcbe42958126f
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/entity/Frictional.java
|
|
@@ -0,0 +1,35 @@
|
|
+package io.papermc.paper.entity;
|
|
+
|
|
+import net.kyori.adventure.util.TriState;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Represents an {@link Entity} that can experience friction with the air and ground.
|
|
+ */
|
|
+public interface Frictional {
|
|
+
|
|
+ /**
|
|
+ * Gets the friction state of this entity.
|
|
+ * When set to {@link TriState#TRUE}, the entity will always experience friction.
|
|
+ * When set to {@link TriState#FALSE}, the entity will never experience friction.
|
|
+ * When set to {@link TriState#NOT_SET}, the entity will fall back to Minecraft's default behaviour.
|
|
+ *
|
|
+ * @return the entity's friction state
|
|
+ */
|
|
+ @NotNull
|
|
+ TriState getFrictionState();
|
|
+
|
|
+ /**
|
|
+ * Sets the friction state of this entity.
|
|
+ * When set to {@link TriState#TRUE}, the entity will always experience friction.
|
|
+ * When set to {@link TriState#FALSE}, the entity will never experience friction.
|
|
+ * When set to {@link TriState#NOT_SET}, the entity will fall back to Minecraft's default behaviour.
|
|
+ * <p>
|
|
+ * Please note that changing this value will do nothing for a player.
|
|
+ *
|
|
+ * @param state the new friction state to set for the entity
|
|
+ */
|
|
+ void setFrictionState(@NotNull TriState state);
|
|
+
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
|
|
index d0bef15785493b512ff0f7414c1d58d38fead581..58017fce436cdbda255f7172fbdadb726d4b113c 100644
|
|
--- a/src/main/java/org/bukkit/entity/Item.java
|
|
+++ b/src/main/java/org/bukkit/entity/Item.java
|
|
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* Represents a dropped item.
|
|
*/
|
|
-public interface Item extends Entity {
|
|
+public interface Item extends Entity, io.papermc.paper.entity.Frictional { // Paper
|
|
|
|
/**
|
|
* Gets the item stack associated with this item drop.
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 55518f6412d4d319df9cdab3bdff52c6e2bcb8c5..4fa02476bbcb0590171d5b20d25156ccb3cc9b6c 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* Represents a living entity, such as a monster or player
|
|
*/
|
|
-public interface LivingEntity extends Attributable, Damageable, ProjectileSource {
|
|
+public interface LivingEntity extends Attributable, Damageable, ProjectileSource, io.papermc.paper.entity.Frictional { // Paper
|
|
|
|
/**
|
|
* Gets the height of the living entity's eyes above its Location.
|