diff options
| author | Nassim Jahnke <[email protected]> | 2022-10-02 09:56:36 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-02 09:56:36 +0200 |
| commit | 928bcc8d3a058221146cea1de7d42d7e178e78f2 (patch) | |
| tree | fdb518a8812097f983c41d36ea693baf5c208554 /patches/api/0336-Goat-ram-API.patch | |
| parent | ec3cfa9b7f147cf097692144f665893748fadc3b (diff) | |
| download | Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.tar.gz Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#8430)
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:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events
CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
Diffstat (limited to 'patches/api/0336-Goat-ram-API.patch')
| -rw-r--r-- | patches/api/0336-Goat-ram-API.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/patches/api/0336-Goat-ram-API.patch b/patches/api/0336-Goat-ram-API.patch new file mode 100644 index 0000000000..06d426a786 --- /dev/null +++ b/patches/api/0336-Goat-ram-API.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Seggan <[email protected]> +Date: Thu, 5 Aug 2021 13:10:31 -0400 +Subject: [PATCH] Goat ram API + + +diff --git a/src/main/java/org/bukkit/entity/Goat.java b/src/main/java/org/bukkit/entity/Goat.java +index 3a24f8cc7a6dee3da30a73f1294cccf03680bdd5..18e48bbb04076f1535b6a4c10e139908e82da44e 100644 +--- a/src/main/java/org/bukkit/entity/Goat.java ++++ b/src/main/java/org/bukkit/entity/Goat.java +@@ -52,4 +52,12 @@ public interface Goat extends Animals { + * @param screaming screaming status + */ + void setScreaming(boolean screaming); ++ ++ // Paper start - Goat ram API ++ /** ++ * Makes the goat ram at the specified entity ++ * @param entity the entity to ram at ++ */ ++ void ram(@org.jetbrains.annotations.NotNull LivingEntity entity); ++ // Paper end + } |