Add PrepareGrindstoneEvent

patches/api/0036-Add-PrepareGrindstoneEvent.patch

@@ -0,0 +1,73 @@
+From e3ed5a4be485106d4b899db2d82f12ae5a11bca4 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Thu, 18 Jun 2020 23:29:43 -0500
+Subject: [PATCH] Add PrepareGrindstoneEvent
+
+---
+ .../inventory/PrepareGrindstoneEvent.java     | 54 +++++++++++++++++++
+ 1 file changed, 54 insertions(+)
+ create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/PrepareGrindstoneEvent.java
+
+diff --git a/src/main/java/net/pl3x/purpur/event/inventory/PrepareGrindstoneEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/PrepareGrindstoneEvent.java
+new file mode 100644
+index 000000000..d0670bb72
+--- /dev/null
++++ b/src/main/java/net/pl3x/purpur/event/inventory/PrepareGrindstoneEvent.java
+@@ -0,0 +1,54 @@
++package net.pl3x.purpur.event.inventory;
++
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.inventory.InventoryEvent;
++import org.bukkit.inventory.GrindstoneInventory;
++import org.bukkit.inventory.InventoryView;
++import org.bukkit.inventory.ItemStack;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++/**
++ * Called when an item is put in a grindstone slot.
++ */
++public class PrepareGrindstoneEvent extends InventoryEvent {
++
++    private static final HandlerList handlers = new HandlerList();
++    private ItemStack result;
++
++    public PrepareGrindstoneEvent(@NotNull InventoryView inventory, @Nullable ItemStack result) {
++        super(inventory);
++        this.result = result;
++    }
++
++    @NotNull
++    @Override
++    public GrindstoneInventory getInventory() {
++        return (GrindstoneInventory) super.getInventory();
++    }
++
++    /**
++     * Get result item, may be null.
++     *
++     * @return result item
++     */
++    @Nullable
++    public ItemStack getResult() {
++        return result;
++    }
++
++    public void setResult(@Nullable ItemStack result) {
++        this.result = result;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
+-- 
+2.26.2
+

patches/server/0116-Add-PrepareGrindstoneEvent.patch

@@ -0,0 +1,45 @@
+From a6e29f80bc005ad2d1fdb68c5ced8e5066979dbd Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Thu, 18 Jun 2020 23:29:54 -0500
+Subject: [PATCH] Add PrepareGrindstoneEvent
+
+---
+ .../java/net/minecraft/server/ContainerGrindstone.java   | 1 +
+ .../org/bukkit/craftbukkit/event/CraftEventFactory.java  | 9 +++++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
+index fcfb4abdc2..0ebdcf0adf 100644
+--- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
++++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
+@@ -161,6 +161,7 @@ public class ContainerGrindstone extends Container {
+         super.a(iinventory);
+         if (iinventory == this.craftInventory) {
+             this.e();
++            org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareGrindstoneEvent(getBukkitView(), resultInventory.getItem(0)); // Purpur
+         }
+ 
+     }
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index ce8d7877ad..a7e0331816 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1521,6 +1521,15 @@ public class CraftEventFactory {
+         return event;
+     }
+ 
++    // Purpur start
++    public static net.pl3x.purpur.event.inventory.PrepareGrindstoneEvent callPrepareGrindstoneEvent(InventoryView view, ItemStack item) {
++        net.pl3x.purpur.event.inventory.PrepareGrindstoneEvent event = new net.pl3x.purpur.event.inventory.PrepareGrindstoneEvent(view, CraftItemStack.asCraftMirror(item).clone());
++        event.getView().getPlayer().getServer().getPluginManager().callEvent(event);
++        event.getInventory().setItem(2, event.getResult());
++        return event;
++    }
++    // Purpur end
++
+     /**
+      * Mob spawner event.
+      */
+-- 
+2.26.2
+

patches/server/0117-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch

@@ -1,4 +1,4 @@
-From a92cfb0d4a86b7bb1b1c7472f1844b11014dcb69 Mon Sep 17 00:00:00 2001
+From d67ebb4e8b56acc0ff314c9e5ddbe5ec41b72366 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 21 Feb 2020 17:04:51 -0600
 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter

patches/server/0118-MC-168772-Fix-Add-turtle-egg-block-options.patch

@@ -1,4 +1,4 @@
-From a2e4cc2b1c6edb9a05f4ae40490c228442f6293c Mon Sep 17 00:00:00 2001
+From 752dbcf296d4f49192a151ce2386aed4185579fb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options

patches/server/0119-MC-4-Fix-Item-position-desync.patch

@@ -1,4 +1,4 @@
-From 51abcd28f8b674ab671d50a661ecdb0607e142a9 Mon Sep 17 00:00:00 2001
+From 8440f2450c9ac45469e5f9c131a2d24251f1fcff Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] MC-4 Fix - Item position desync

patches/server/0120-MC-56653-Fix-pig-zombies-aggro.patch

@@ -1,4 +1,4 @@
-From 61fae64183bd5209977c521146bc1db1788ba13a Mon Sep 17 00:00:00 2001
+From f3fe7a102583cf90921272adaddfef9ed6ff0ca2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] MC-56653 Fix - pig zombies aggro

patches/server/0121-EMC-MonsterEggSpawn-Event.patch

@@ -1,4 +1,4 @@
-From 2cda63fae2890ae6a9b36b656a0b27f783be8657 Mon Sep 17 00:00:00 2001
+From 79b80ce6003c5c65222feec9fb2bf32e0c04a013 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 20 Jul 2013 22:40:56 -0400
 Subject: [PATCH] EMC - MonsterEggSpawn Event

patches/server/0122-PaperPR-Add-BellRingEvent.patch

@@ -1,4 +1,4 @@
-From af0ccd63a3f9f4c93e5a3ccc1dc6d6ce70b8622c Mon Sep 17 00:00:00 2001
+From 0f904c482a4ce6055680cf30d762e9a25634278f Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:32 -0700
 Subject: [PATCH] PaperPR - Add BellRingEvent

patches/server/0123-PaperPR-Per-World-Spawn-limits.patch

@@ -1,4 +1,4 @@
-From 6f1e3968ebb8f81a84e28d28cd64f48c5fc7f9c9 Mon Sep 17 00:00:00 2001
+From ae65a590a8dc41acff3b4536109159d4ee79115a Mon Sep 17 00:00:00 2001
 From: chase <chasewhip20@gmail.com>
 Date: Sun, 15 Mar 2020 18:32:22 -0600
 Subject: [PATCH] PaperPR - Per World Spawn limits
@@ -31,7 +31,7 @@ index 7e7f10351b..f2281d3259 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e54cff571c..cc1fb7108a 100644
+index 288eae54fa..c1dd618e04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -333,6 +333,13 @@ public class CraftWorld implements World {

patches/server/0124-PaperPR-PlayerItemCooldownEvent.patch

@@ -1,4 +1,4 @@
-From 13c58b12b39ccbb8c0edfaeb2140675662054e12 Mon Sep 17 00:00:00 2001
+From bae1d2006d60c97a686f816d18d6fa54bf76d926 Mon Sep 17 00:00:00 2001
 From: KennyTV <kennytv@t-online.de>
 Date: Mon, 20 Apr 2020 13:57:06 +0200
 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent

patches/server/0125-PaperPR-Fix-more-exploits-carpet-dupe-rail-dupe-bedr.patch

@@ -1,4 +1,4 @@
-From b2c766502d6a3d85a6d8743a9ff235bd10acacf6 Mon Sep 17 00:00:00 2001
+From d5525ef160f81107273a8900513f869ae4f284d3 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 11 Jun 2020 17:29:42 -0700
 Subject: [PATCH] PaperPR - Fix more exploits (carpet dupe, rail dupe, bedrock

patches/server/0126-PaperPR-fixup-Protect-Bedrock-and-End-Portal-Frames-.patch

@@ -1,4 +1,4 @@
-From e9a526238a869c9b1238f4278f7086fc292e11e8 Mon Sep 17 00:00:00 2001
+From 42e0355d159e2e4f8f931b2f0d9599a9ef541754 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 12 Jun 2020 11:45:41 -0700
 Subject: [PATCH] PaperPR - fixup! Protect Bedrock and End Portal/Frames from

patches/server/0127-PaperPR-Fix-sand-duping.patch

@@ -1,4 +1,4 @@
-From c6f6d063de2c8a20138143945b79f879adf2be87 Mon Sep 17 00:00:00 2001
+From 64b50bd6c8b3b0556d1813ce6be147d741628fcc Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 12 Jun 2020 13:33:19 -0700
 Subject: [PATCH] PaperPR - Fix sand duping

patches/server/0128-PaperPR-Prevent-position-desync-in-playerconnection-.patch

@@ -1,4 +1,4 @@
-From d3fc90698c11fde0a7c56d6147eb4f7d075abef4 Mon Sep 17 00:00:00 2001
+From 9ecbe216e237d1ec36d673217db1c26e514748be Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 12 Jun 2020 16:51:39 -0700
 Subject: [PATCH] PaperPR - Prevent position desync in playerconnection causing

patches/server/0129-PaperPR-Fix-enderdragon-exp-dupe.patch

@@ -1,4 +1,4 @@
-From b3844763525ac664bd1ba437cf895bba3021d82d Mon Sep 17 00:00:00 2001
+From 4720840046eea35a58d5f4a60bc7337f5ca9bce9 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 12 Jun 2020 22:25:11 -0700
 Subject: [PATCH] PaperPR - Fix enderdragon exp dupe

patches/server/0130-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch

@@ -1,4 +1,4 @@
-From 1058842736fe70a7cd1d02871b8f38ae78fa5dc9 Mon Sep 17 00:00:00 2001
+From 6b6fcb9d7ec44fbb629145a1a2d37770d5b60fb8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Fri, 3 Apr 2020 02:21:13 -0700
 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server

patches/server/0131-Tuinity-Piston-pushable-TileEntities.patch

@@ -1,4 +1,4 @@
-From 899630cfb2091206f8399ef6adec3708711381b9 Mon Sep 17 00:00:00 2001
+From 5a033005a5db9a2fa0d3c1dbff281d56469988ae Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Sun, 14 Jun 2020 00:34:47 -0700
 Subject: [PATCH] Tuinity - Piston pushable TileEntities

patches/server/0132-YAPFA-Disable-mojang-profiler.patch

@@ -1,4 +1,4 @@
-From 52abb0f3e0d0466bc29caacf40e509ff776e9127 Mon Sep 17 00:00:00 2001
+From d4eb2bae7ba3e08c51270950cb62e7019c5365ca Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 23:08:01 +0100
 Subject: [PATCH] YAPFA - Disable mojang profiler