From f870db0c13c62ff7e0dc2708475511d88c3f003f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 22 Jun 2019 16:28:44 -0500
Subject: [PATCH] Update upstream

---
 Paper                                                 |  2 +-
 current-paper                                         |  2 +-
 patches/server/0021-Bring-back-server-name.patch      |  8 ++++----
 patches/server/0030-Block-and-Fluid-Tick-Events.patch | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Paper b/Paper
index 55aa29c70..768b46ed6 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 55aa29c70036dd67721adc88713d62009023e2d1
+Subproject commit 768b46ed638a64e9700195179acd172030b43d47
diff --git a/current-paper b/current-paper
index eeaac6513..19c25db2b 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.14.2--e7afcb94bfb4819cc07e5376799501e6487c9049
+1.14.2--1a214f52c1eb403badd3ff9be853dcb3b0baf558
diff --git a/patches/server/0021-Bring-back-server-name.patch b/patches/server/0021-Bring-back-server-name.patch
index 8f9bfbdc1..88e302518 100644
--- a/patches/server/0021-Bring-back-server-name.patch
+++ b/patches/server/0021-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From 3d321157c33e04aefc2894812e25f9f59018a357 Mon Sep 17 00:00:00 2001
+From 99bea024c7f98be45de976150511d13dbc842fe2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 8 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-index fb092a941..54c0b4247 100644
+index fb092a9416..54c0b4247f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -21,10 +21,10 @@ index fb092a941..54c0b4247 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 99004792e..43c26e7fd 100644
+index eaba25d780..62883d7251 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2149,4 +2149,11 @@ public final class CraftServer implements Server {
+@@ -2158,4 +2158,11 @@ public final class CraftServer implements Server {
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
      }
      // Paper end
diff --git a/patches/server/0030-Block-and-Fluid-Tick-Events.patch b/patches/server/0030-Block-and-Fluid-Tick-Events.patch
index 38a50f304..a7d7e0757 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 c77a444353bc88dd1a663530a3ac4e718eff6aef Mon Sep 17 00:00:00 2001
+From 1a31c3947216fa6cfe3893f00c5783e88b69e5fd 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 135ec94c6..a07785941 100644
+index 135ec94c6f..a077859418 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 {
@@ -46,7 +46,7 @@ index 135ec94c6..a07785941 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a649a4c35..92eeaca42 100644
+index a649a4c359..92eeaca428 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -106,4 +106,11 @@ public class PurpurWorldConfig {
@@ -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 53d4f46d4..3a833868c 100644
+index 9bb1ad077a..c404c7ff44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2155,6 +2155,24 @@ public class CraftWorld implements World {
+@@ -2174,6 +2174,24 @@ public class CraftWorld implements World {
      }
      // Paper end