Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2609a118 Updated Upstream (Bukkit/CraftBukkit)

Tuinity Changes:
0850468 Properly ignite entities that stand in fire
This commit is contained in:
William Blake Galbreath
2020-11-07 15:02:10 -06:00
parent 137523f7e8
commit 1eaac716d2
9 changed files with 34 additions and 34 deletions

View File

@@ -111,10 +111,10 @@ index 229c3b0f0c..f88cf526d2 100644
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b48c3a1c04..462a025022 100644
index 08518ff57b..b6aa6454e2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1513,7 +1513,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1514,7 +1514,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {