diff options
| author | Jake Potrebic <[email protected]> | 2024-03-08 15:52:00 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-03-08 15:52:00 -0800 |
| commit | a0931f48646aa60ccdbdd8827bf68dba88a6c238 (patch) | |
| tree | 05b3a8432a59029276b5de74a41504ec62816c84 /patches/server/0801-Add-EntityToggleSitEvent.patch | |
| parent | 0052e2db39e4032f37c6679fe58272de69d7c832 (diff) | |
| download | Paper-a0931f48646aa60ccdbdd8827bf68dba88a6c238.tar.gz Paper-a0931f48646aa60ccdbdd8827bf68dba88a6c238.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#10301)
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:
7ca2b46c SPIGOT-7594: Fix typo and include missing MinecraftExperimental annotation in Loot Table enum
CraftBukkit Changes:
176c0ad39 Fix copying BlockStates with fields (eg, Banner)
ee685bd2a Fix Camel not standing up when hurt
619936d4b Increase outdated build delay
Diffstat (limited to 'patches/server/0801-Add-EntityToggleSitEvent.patch')
| -rw-r--r-- | patches/server/0801-Add-EntityToggleSitEvent.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0801-Add-EntityToggleSitEvent.patch b/patches/server/0801-Add-EntityToggleSitEvent.patch index 3db46de79b..e149e09cf1 100644 --- a/patches/server/0801-Add-EntityToggleSitEvent.patch +++ b/patches/server/0801-Add-EntityToggleSitEvent.patch @@ -69,10 +69,10 @@ index 4abd26c7baf8f198f13dd41a3146f9ece13a4164..0297e234f17c6157cfff79420b9eeaf4 } diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index be8e056f82e348d7cd14bb22a873207cddfb3044..5f879ec74cadc8b27f3c1648890978dbdc27f9f0 100644 +index 090d36d73b12fec59782142e2e85f17ba35dc6be..7860331b640fe48d1f2357d9f8e2e40c682b3620 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -@@ -556,7 +556,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl +@@ -580,7 +580,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl } public void sitDown() { @@ -81,7 +81,7 @@ index be8e056f82e348d7cd14bb22a873207cddfb3044..5f879ec74cadc8b27f3c1648890978db this.playSound(SoundEvents.CAMEL_SIT, 1.0F, this.getVoicePitch()); this.setPose(Pose.SITTING); this.gameEvent(GameEvent.ENTITY_ACTION); -@@ -565,7 +565,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl +@@ -589,7 +589,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl } public void standUp() { @@ -90,7 +90,7 @@ index be8e056f82e348d7cd14bb22a873207cddfb3044..5f879ec74cadc8b27f3c1648890978db this.playSound(SoundEvents.CAMEL_STAND, 1.0F, this.getVoicePitch()); this.setPose(Pose.STANDING); this.gameEvent(GameEvent.ENTITY_ACTION); -@@ -574,6 +574,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl +@@ -598,6 +598,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl } public void standUpInstantly() { |