Update upstream

This commit is contained in:
William Blake Galbreath
2019-06-17 20:05:26 -05:00
parent a2c8ca3f6c
commit aba2ae2b8a
3 changed files with 5 additions and 5 deletions

2
Paper

Submodule Paper updated: 9bdce9f499...7fc60e411a

View File

@@ -1 +1 @@
1.14.2--8b712bedd00aaec0e6e9a554273f6c907e2702f4
1.14.2--0a1ffa2bae98dc4982bec270bad228ce0156bb27

View File

@@ -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