2022-11-26 01:23:12 +01:00
|
|
|
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
|
2024-09-30 20:44:36 +02:00
|
|
|
index 0000000000000000000000000000000000000000..315558d8a592f7238f45fd1e68b70476e721be92
|
2022-11-26 01:23:12 +01:00
|
|
|
--- /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;
|
2024-09-30 20:44:36 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
2022-11-26 01:23:12 +01:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Represents an {@link Entity} that can experience friction with the air and ground.
|
|
|
|
+ */
|
2024-09-30 20:44:36 +02:00
|
|
|
+@NullMarked
|
2022-11-26 01:23:12 +01:00
|
|
|
+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
|
|
|
|
+ */
|
|
|
|
+ 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
|
|
|
|
+ */
|
2024-09-30 20:44:36 +02:00
|
|
|
+ void setFrictionState(TriState state);
|
2022-11-26 01:23:12 +01:00
|
|
|
+
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
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:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f50b6c1f1a 100644
|
2022-11-26 01:23:12 +01:00
|
|
|
--- 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
|
2024-12-03 17:58:41 +01:00
|
|
|
index fd4d74a637a93c85a057e867b8c07e574916175a..8cc4ab8f560f5db9cf7f58233578838945a52deb 100644
|
2022-11-26 01:23:12 +01:00
|
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
|
2022-11-26 01:23:12 +01:00
|
|
|
/**
|
|
|
|
* 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.
|
2024-10-30 17:31:33 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java
|
2024-12-03 17:58:41 +01:00
|
|
|
index c3c94a5694f1e8d79e5acc45af1cd2e0fa6a621f..0e4163c9358dc2dc6b8b0aca1da0f59c805e47f4 100644
|
2024-10-30 17:31:33 +01:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Minecart.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Minecart.java
|
|
|
|
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.Nullable;
|
|
|
|
/**
|
|
|
|
* Represents a minecart entity.
|
|
|
|
*/
|
|
|
|
-public interface Minecart extends Vehicle {
|
|
|
|
+public interface Minecart extends Vehicle, io.papermc.paper.entity.Frictional { // Paper
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets a minecart's damage.
|