From 754300f6494485cc35fcbf9d4dc45519a5ef8a72 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:21:54 -0500
Subject: [PATCH] Javadoc stuffs

---
 patches/api/0017-Add-more-llama-API.patch  | 25 +++++++++++++++-------
 patches/api/0018-Add-entity-jump-API.patch | 17 +++++++++------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/patches/api/0017-Add-more-llama-API.patch b/patches/api/0017-Add-more-llama-API.patch
index c210e5d60..56ece7002 100644
--- a/patches/api/0017-Add-more-llama-API.patch
+++ b/patches/api/0017-Add-more-llama-API.patch
@@ -1,22 +1,22 @@
-From 1d4b77522dae9f37f5649de7a1206fc9092a4de1 Mon Sep 17 00:00:00 2001
+From 6c9243d1efa5a31ec3ce74f295a99a9c5d4237ed Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:05 -0500
 Subject: [PATCH] Add more llama API
 
 ---
- .../event/entity/LlamaJoinCaravanEvent.java   | 55 ++++++++++++++++
- .../event/entity/LlamaLeaveCaravanEvent.java  | 31 ++++++++++
+ .../event/entity/LlamaJoinCaravanEvent.java   | 61 ++++++++++++++++++
+ .../event/entity/LlamaLeaveCaravanEvent.java  | 34 ++++++++++
  src/main/java/org/bukkit/entity/Llama.java    | 62 +++++++++++++++++++
- 3 files changed, 148 insertions(+)
+ 3 files changed, 157 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
  create mode 100644 src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
 new file mode 100644
-index 000000000..2cb006f5d
+index 000000000..6e68c1399
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,61 @@
 +package net.pl3x.purpur.event.entity;
 +
 +import org.bukkit.entity.Llama;
@@ -25,6 +25,12 @@ index 000000000..2cb006f5d
 +import org.bukkit.event.entity.EntityEvent;
 +import org.jetbrains.annotations.NotNull;
 +
++/**
++ * Called when a Llama tries to join a caravan.
++ * <p>
++ * Cancelling the event will not let the Llama join. To prevent future attempts
++ * at joining a caravan use {@link Llama#setShouldJoinCaravan(boolean)}.
++ */
 +public class LlamaJoinCaravanEvent extends EntityEvent implements Cancellable {
 +    private static final HandlerList handlers = new HandlerList();
 +    private boolean canceled;
@@ -74,10 +80,10 @@ index 000000000..2cb006f5d
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
 new file mode 100644
-index 000000000..ea61463f0
+index 000000000..ec8d978c2
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,34 @@
 +package net.pl3x.purpur.event.entity;
 +
 +import org.bukkit.entity.Llama;
@@ -85,6 +91,9 @@ index 000000000..ea61463f0
 +import org.bukkit.event.entity.EntityEvent;
 +import org.jetbrains.annotations.NotNull;
 +
++/**
++ * Called when a Llama leaves a caravan
++ */
 +public class LlamaLeaveCaravanEvent extends EntityEvent {
 +    private static final HandlerList handlers = new HandlerList();
 +
diff --git a/patches/api/0018-Add-entity-jump-API.patch b/patches/api/0018-Add-entity-jump-API.patch
index 708d24fbc..afd3ea789 100644
--- a/patches/api/0018-Add-entity-jump-API.patch
+++ b/patches/api/0018-Add-entity-jump-API.patch
@@ -1,20 +1,20 @@
-From dbcdb8b288e4323f62ce4da37a339a7a3335aed1 Mon Sep 17 00:00:00 2001
+From 19317a535dccfc01547e6c4a8a7239cefc0e81e4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:34:38 -0500
 Subject: [PATCH] Add entity jump API
 
 ---
- .../purpur/event/entity/EntityJumpEvent.java  | 41 +++++++++++++++++++
- .../java/org/bukkit/entity/LivingEntity.java  | 21 ++++++++++
- 2 files changed, 62 insertions(+)
+ .../purpur/event/entity/EntityJumpEvent.java  | 46 +++++++++++++++++++
+ .../java/org/bukkit/entity/LivingEntity.java  | 21 +++++++++
+ 2 files changed, 67 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/event/entity/EntityJumpEvent.java
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityJumpEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityJumpEvent.java
 new file mode 100644
-index 000000000..3f11fb0ab
+index 000000000..08546c01d
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityJumpEvent.java
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,46 @@
 +package net.pl3x.purpur.event.entity;
 +
 +import org.bukkit.entity.LivingEntity;
@@ -23,6 +23,11 @@ index 000000000..3f11fb0ab
 +import org.bukkit.event.entity.EntityEvent;
 +import org.jetbrains.annotations.NotNull;
 +
++/**
++ * Called when an entity jumps
++ * <p>
++ * Cancelling the event will stop the entity from jumping
++ */
 +public class EntityJumpEvent extends EntityEvent implements Cancellable {
 +    private static final HandlerList handlers = new HandlerList();
 +    private boolean canceled;