Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
160d1bc9 Only write to cached header in RegionFile if write potentially succeeds (#2294)
ef682381 SPIGOT-5190: Do not call superfluous EntityCombustEvent
This commit is contained in:
William Blake Galbreath
2019-07-21 19:28:51 -05:00
parent 96e0202b09
commit bfef0b78b4
3 changed files with 6 additions and 6 deletions

2
Paper

Submodule Paper updated: 9fe63a1673...160d1bc9e4

View File

@@ -1 +1 @@
1.14.4--155e9010bcec0a9bca97b3b99c2c5ebc18afae2a
1.14.4--93345b023be5f2dfdee7ac5d9a2fbc1e63c1fe12

View File

@@ -1,4 +1,4 @@
From 6e5123eaf84800e4f27e2c306e915903de098241 Mon Sep 17 00:00:00 2001
From f96b36338d8d134959290156ae37f2803bd1a97e Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:23:10 -0700
Subject: [PATCH] Asynchronous chunk IO and loading
@@ -3232,11 +3232,11 @@ index e698e1c931..965c104b7b 100644
return this.n;
}
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index 66c8b0307f..2ee4b88f09 100644
index 41f1e15cb0..3884dd84d1 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -337,7 +337,7 @@ public class RegionFile implements AutoCloseable {
this.writeInt(i); // Paper - Avoid 3 io write calls
@@ -340,7 +340,7 @@ public class RegionFile implements AutoCloseable {
this.d[j] = i; // Paper - move this to after the write
}
- public void close() throws IOException {