Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
19ff55ef Update upstream B/CB
79710332 Update upstream CB
19de9af6 1.15.2 update (#2887)
d4ae43fc Updated Upstream (Bukkit/CraftBukkit)
9c2d9a5f [CI-SKIP] Rebuild patches
86a4b752 Fix items not falling correctly (Resolves #2835) (#2872)
35472de2 Port activation range improvement patch (#2763)
617f6033 Add effect to block break naturally (#2819)
f63cfe00 Updated Upstream (Bukkit/CraftBukkit)
00860e4e [CI-SKIP] rebuild patches
3d519668 Prevent sync chunk loads when villagers try to find beds (#2855)
This commit is contained in:
William Blake Galbreath
2020-01-21 22:17:22 -06:00
parent ab2c6c147e
commit 8ad9357437
38 changed files with 466 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0021-Advancement-API-Additions.patch
View File

@@ -1,30 +1,32 @@
From 89db8d3ffb6701c7c4a9ff71cfe817cfc2c0285c Mon Sep 17 00:00:00 2001
From 507d771b4b5a27cf3dc9232f4af6b62001b760d9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 31 May 2019 21:24:33 -0500
Subject: [PATCH] Advancement API Additions
---
.../net/minecraft/server/Advancement.java | 2 +-
.../net/minecraft/server/Advancement.java | 4 +-
.../minecraft/server/AdvancementDisplay.java | 8 +++-
.../server/AdvancementFrameType.java | 14 ++++--
.../advancement/CraftAdvancement.java | 6 +++
.../advancement/CraftAdvancementDisplay.java | 48 +++++++++++++++++++
5 files changed, 73 insertions(+), 5 deletions(-)
5 files changed, 74 insertions(+), 6 deletions(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
index 3ef2f4d2a..ac4c29f2b 100644
index 4b85551fa..c9df67464 100644
--- a/src/main/java/net/minecraft/server/Advancement.java
+++ b/src/main/java/net/minecraft/server/Advancement.java
@@ -20,7 +20,7 @@ import org.apache.commons.lang3.ArrayUtils;
public class Advancement {
@@ -64,8 +64,8 @@ public class Advancement {
return this.parent;
}
- @Nullable
- public AdvancementDisplay c() {
+ @Nullable public AdvancementDisplay getDisplay() { return c(); } // Purpur - OBFHELPER
+ @Nullable public AdvancementDisplay c() {
return this.display;
}
private final Advancement a;
- private final AdvancementDisplay b;
+ private final AdvancementDisplay b; public AdvancementDisplay getDisplay() { return b; } // Purpur - OBFHELPER
private final AdvancementRewards c;
private final MinecraftKey d;
private final Map<String, Criterion> e;
diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
index e8172d56f..edfd7f84a 100644
--- a/src/main/java/net/minecraft/server/AdvancementDisplay.java