Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4a97a7ca Add option to disable pillager patrols (#2626)
23e53aab Backport MC-160177 fix from 1.15 (#2702)
45089d59 Update upstream CB
761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)
This commit is contained in:
William Blake Galbreath
2019-11-24 14:01:05 -06:00
parent cfd297a4c3
commit 84e7469798
42 changed files with 106 additions and 191 deletions

View File

@@ -0,0 +1,24 @@
From 3cd2e9d59270365d1315c92b17c8a0c5c454184f 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 4fe7324475..6e5d81daf1 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.24.0.rc1