Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
c4ae0002 Fix some API and commands usage of inactive chunks (#2457)
700a6649 Print entity debug stacktrace on entity double add (#2438)
9d6680ee Fix MC-158900 (#2458)
928abb41 [CI-SKIP] Rebuild patches for last merge
34e64781 Do less work if we have a custom Bukkit generator (#2318)
This commit is contained in:
William Blake Galbreath
2019-08-15 12:55:24 -05:00
parent e9d374a46c
commit 87eeb03354
6 changed files with 44 additions and 20 deletions

View File

@@ -0,0 +1,24 @@
From 89cb55714c89430c7675fc909da2c0ebf0b07c87 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 11 Aug 2019 22:25:33 -0500
Subject: [PATCH] Advancement stuffs
---
src/main/java/net/minecraft/server/CriterionTrigger.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java
index 4fe732447..6e5d81daf 100644
--- a/src/main/java/net/minecraft/server/CriterionTrigger.java
+++ b/src/main/java/net/minecraft/server/CriterionTrigger.java
@@ -27,6 +27,7 @@ public interface CriterionTrigger<T extends CriterionInstance> {
this.c = s;
}
+ public T getInstance() { return a(); } // Purpur - OBFHELPER
public T a() {
return this.a;
}
--
2.23.0.rc1