aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0676-Entity-powdered-snow-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0676-Entity-powdered-snow-API.patch')
-rw-r--r--patches/server/0676-Entity-powdered-snow-API.patch16
1 files changed, 9 insertions, 7 deletions
diff --git a/patches/server/0676-Entity-powdered-snow-API.patch b/patches/server/0676-Entity-powdered-snow-API.patch
index 60a2d3839b..449adb8c8d 100644
--- a/patches/server/0676-Entity-powdered-snow-API.patch
+++ b/patches/server/0676-Entity-powdered-snow-API.patch
@@ -7,21 +7,23 @@ Subject: [PATCH] Entity powdered snow API
public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 06febdb103f98dd16cca32d7345b0ca6b52dcade..8f0df02a81c36244a3906efa6605f5eba030bfb9 100644
+index c819fa8e5b69c23558a89b68f9a5a31e1b233ca3..25c064a7da80ef98a758d7cb8bd1aa3de452e2e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1087,6 +1087,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
- this.entity.setRot(location.getYaw(), location.getPitch());
- return !this.entity.valid && this.entity.level().addFreshEntity(this.entity, reason);
+@@ -1070,6 +1070,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
-+
+ // Paper end - raw entity serialization API
+
++ // Paper start - entity powdered snow API
+ @Override
+ public boolean isInPowderedSnow() {
+ return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
+ }
- // Paper end
-
++ // Paper end - entity powdered snow API
++
// Paper start - missing entity api
+ @Override
+ public boolean isInvisible() { // Paper - moved up from LivingEntity
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
index a0ea54181de6c6685deef265cbe9f66aabbca42b..6f98da9be6aef35e3b5c940188b872459a383c8e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java