aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0829-Entity-powdered-snow-API.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2022-03-02 09:44:22 +0000
committerShane Freeder <[email protected]>2022-03-02 09:44:22 +0000
commitc6ea84c7fae8d2974820333505a39c7b01c39b90 (patch)
tree0a863ecd50aa71b1196200c545651fe7eb779e2a /patches/server/0829-Entity-powdered-snow-API.patch
parentd3caeeb6c27cc832030a90c714a69ad2457b6e95 (diff)
downloadPaper-c6ea84c7fae8d2974820333505a39c7b01c39b90.tar.gz
Paper-c6ea84c7fae8d2974820333505a39c7b01c39b90.zip
Drop unneeded desync patch
spigot no longer even fires the event for this case, so, this may actually be a regression, not too sure here, but, as-is this patch is dead
Diffstat (limited to 'patches/server/0829-Entity-powdered-snow-API.patch')
-rw-r--r--patches/server/0829-Entity-powdered-snow-API.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/server/0829-Entity-powdered-snow-API.patch b/patches/server/0829-Entity-powdered-snow-API.patch
new file mode 100644
index 0000000000..7df19b80b9
--- /dev/null
+++ b/patches/server/0829-Entity-powdered-snow-API.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 24 Oct 2021 20:58:43 -0700
+Subject: [PATCH] Entity powdered snow API
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+index 9e5f338d0bb64ac47a99cd08a2ab083d2f5caf6c..0a998832afacb25cbaf39737d14aa33eab6967b7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -1294,5 +1294,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+ entity.setRot(location.getYaw(), location.getPitch());
+ return !entity.valid && entity.level.addFreshEntity(entity, reason);
+ }
++
++ @Override
++ public boolean isInPowderedSnow() {
++ return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
++ }
+ // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
+index 90f34d75f99f31f5c98c499df209979a03e23191..1737857424c5da885c46f39502cafd2a670d3be7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
+@@ -51,4 +51,11 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
+ public SkeletonType getSkeletonType() {
+ return SkeletonType.NORMAL;
+ }
++
++ // Paper start
++ @Override
++ public int inPowderedSnowTime() {
++ return getHandle().inPowderSnowTime;
++ }
++ // Paper end
+ }