From a2c8ca3f6ccac437bd07b89b868c0e80802a9b5f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 16 Jun 2019 19:49:35 -0500
Subject: [PATCH] Update upstream

---
 Paper                                                 | 2 +-
 current-paper                                         | 2 +-
 patches/server/0027-Allow-color-codes-on-signs.patch  | 6 +++---
 patches/server/0030-Block-and-Fluid-Tick-Events.patch | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Paper b/Paper
index 41c864ab7..9bdce9f49 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 41c864ab7a1cbf75aff0d7113e298e72821639ec
+Subproject commit 9bdce9f499a62bc6cff228a3166cbbbe7c050b07
diff --git a/current-paper b/current-paper
index b8d0f94ea..cf32de34e 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.14.2--c6c2a1d7379cea421f6cfb513606a85d364d769a
+1.14.2--8b712bedd00aaec0e6e9a554273f6c907e2702f4
diff --git a/patches/server/0027-Allow-color-codes-on-signs.patch b/patches/server/0027-Allow-color-codes-on-signs.patch
index fb33ccac4..ad5077db1 100644
--- a/patches/server/0027-Allow-color-codes-on-signs.patch
+++ b/patches/server/0027-Allow-color-codes-on-signs.patch
@@ -1,4 +1,4 @@
-From 24e81a3697d68a79e3741f6b7cfc0c31c1883bb9 Mon Sep 17 00:00:00 2001
+From 4eec5d1965f0c06f9c6823c8f00bc604527dfeac Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Allow color codes on signs
@@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs
  4 files changed, 21 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ed37f45f1..598bd6afc 100644
+index d27354667..babbc4add 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1106,6 +1106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1112,6 +1112,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void openSign(TileEntitySign tileentitysign) {
          tileentitysign.a((EntityHuman) this);
diff --git a/patches/server/0030-Block-and-Fluid-Tick-Events.patch b/patches/server/0030-Block-and-Fluid-Tick-Events.patch
index 07581df59..df9e761d2 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 215b5058ec04eb3901fa9edb3470c5febbe4216c Mon Sep 17 00:00:00 2001
+From 0362adeb5dfa1f4f32b3781f4d4165df371ead53 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Block and Fluid Tick Events
  3 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 92aad060e..01b77528e 100644
+index 135ec94c6..a07785941 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -446,13 +446,13 @@ public class WorldServer extends World {
@@ -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 0c5379530..07f980158 100644
+index e0d89cc53..43ca8bb2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2157,6 +2157,24 @@ public class CraftWorld implements World {
+@@ -2159,6 +2159,24 @@ public class CraftWorld implements World {
      }
      // Paper end