mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 11:42:55 +01:00
e035fd7034
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: cc9aa21a SPIGOT-6399, SPIGOT-7344: Clarify collidable behavior for player entities f23325b6 Add API for per-world simulation distances 26e1774e Add API for per-world view distances 0b541e60 Add PlayerLoginEvent#getRealAddress 5f027d2d PR-949: Add Vector#fromJOML() overloads for read-only vector types CraftBukkit Changes: bcf56171a PR-1321: Clean up some stuff which got missed during previous PRs 7f833a2d1 SPIGOT-7462: Players no longer drop XP after dying near a Sculk Catalyst 752aac669 Implement APIs for per world view and simulation distances 57d7ef433 Preserve empty enchantment tags for glow effect 465ec3fb4 Remove connected check on setScoreboard f90ce621e Use one PermissibleBase for all command blocks 5876cca44 SPIGOT-7550: Fix creation of Arrow instances f03fc3aa3 SPIGOT-7549: ServerTickManager#setTickRate incorrect Precondition 9d7f49b01 SPIGOT-7548: Fix wrong spawn location for experience orb and dropped item Spigot Changes: ed9ba9a4 Drop no longer required patch ignoring -o option 86b5dd6a SPIGOT-7546: Fix hardcoded check for outdated client message aa7cde7a Remove obsolete APIs for per world view and simulation distances 6dff577e Remove obsolete patch preserving empty `ench` tags a3bf95b8 Remove obsolete PlayerLoginEvent#getRealAddress 1b02f5d6 Remove obsolete connected check on setScoreboard patch acf717eb Remove obsolete command block PermissibleBase patch 053fa2a9 Remove redundant patch dealing with null tile entities
73 lines
3.1 KiB
Diff
73 lines
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 c0e31ebbb41bd3013fe4a1609dd9af754434736d..b6df5fd8eda6a30c119b3fa3844e6bb0425e2f39 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -27,7 +27,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.
|