From aba2ae2b8ab43c3844e2ad7a332997f4671b0eb3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 17 Jun 2019 20:05:26 -0500
Subject: [PATCH] Update upstream

---
 Paper                                                 | 2 +-
 current-paper                                         | 2 +-
 patches/server/0030-Block-and-Fluid-Tick-Events.patch | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Paper b/Paper
index 9bdce9f49..7fc60e411 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 9bdce9f499a62bc6cff228a3166cbbbe7c050b07
+Subproject commit 7fc60e411aa9ab4652d394bfdf01baa184ff882e
diff --git a/current-paper b/current-paper
index cf32de34e..f171c643f 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.14.2--8b712bedd00aaec0e6e9a554273f6c907e2702f4
+1.14.2--0a1ffa2bae98dc4982bec270bad228ce0156bb27
diff --git a/patches/server/0030-Block-and-Fluid-Tick-Events.patch b/patches/server/0030-Block-and-Fluid-Tick-Events.patch
index df9e761d2..38a50f304 100644
--- a/patches/server/0030-Block-and-Fluid-Tick-Events.patch
+++ b/patches/server/0030-Block-and-Fluid-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 0362adeb5dfa1f4f32b3781f4d4165df371ead53 Mon Sep 17 00:00:00 2001
+From c77a444353bc88dd1a663530a3ac4e718eff6aef Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 23:23:52 -0500
 Subject: [PATCH] Block and Fluid Tick Events
@@ -62,10 +62,10 @@ index a649a4c35..92eeaca42 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e0d89cc53..43ca8bb2e 100644
+index 53d4f46d4..3a833868c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2159,6 +2159,24 @@ public class CraftWorld implements World {
+@@ -2155,6 +2155,24 @@ public class CraftWorld implements World {
      }
      // Paper end