aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0678-Entity-powdered-snow-API.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-02-11 22:28:00 +0100
committerGitHub <[email protected]>2024-02-11 22:28:00 +0100
commit31699ae9a8f3a57491e9c9276cffa5a51e9a5f60 (patch)
tree066237108974856e6a02b481451a17642afa530e /patches/server/0678-Entity-powdered-snow-API.patch
parentcde5587e58f08ce2d8875bb9d13a4be56825e353 (diff)
downloadPaper-31699ae9a8f3a57491e9c9276cffa5a51e9a5f60.tar.gz
Paper-31699ae9a8f3a57491e9c9276cffa5a51e9a5f60.zip
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit) 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: a6a9d2a4 Remove some old ApiStatus.Experimental annotations be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration 08f86d1c PR-971: Add Player methods for client-side potion effects 2e3024a9 PR-963: Add API for in-world structures a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality 1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent CraftBukkit Changes: 38fd4bd50 Fix accidentally renamed internal damage method 80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage 7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects 4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration 22a541a29 Improve support for per-world game rules cb7dccce2 PR-1348: Add Player methods for client-side potion effects b8d6109f0 PR-1335: Add API for in-world structures 4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity e74107678 Fix Crafter maximum stack size 0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality 4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason 20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette 3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook 333701839 SPIGOT-7572: Bee nests generated without bees f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
Diffstat (limited to 'patches/server/0678-Entity-powdered-snow-API.patch')
-rw-r--r--patches/server/0678-Entity-powdered-snow-API.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0678-Entity-powdered-snow-API.patch b/patches/server/0678-Entity-powdered-snow-API.patch
new file mode 100644
index 0000000000..817eaf068a
--- /dev/null
+++ b/patches/server/0678-Entity-powdered-snow-API.patch
@@ -0,0 +1,39 @@
+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
+
+== AT ==
+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 71845027ba1b755ead76cf75d011547d9910597a..47be73dbb0dd1b6cef0113042be6a80cb6209252 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -1086,5 +1086,10 @@ 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);
+ }
++
++ @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 a0ea54181de6c6685deef265cbe9f66aabbca42b..6f98da9be6aef35e3b5c940188b872459a383c8e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
+@@ -45,4 +45,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
+ }