Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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:
8522e7b2 Fix shutdown on eula not being agreed (Fixes #4647)
c43dcbfc Improve old UUID support, clean up old legacy keys.
f63e3dd1 Allow teleporting through end gateways as a passenger/vehicle
b7d9e3d5 Convert legacy attributes in Item Meta
4fd0d54e Fix server not stopping when eula not agreed yet
6f30ecde Clean up duplicated GameProfile Properties
d3047226 Fix supporting more places of the old UUID format
f5265d66 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-07-01 08:35:49 -05:00
parent 2878dc4f57
commit adf463a0af
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 7ce690f49e...8522e7b274

2
current-paper
View File

@@ -1 +1 @@
1.16.1--3150404176b0594249ff18968f5ff4663bbc95a9
1.16.1--60c274b0bdfbddf76123182f724083092e5b1fdc

6
patches/server/0014-ItemFactory-getMonsterEgg.patch
View File

@@ -1,4 +1,4 @@
From ca23ccf9910f7575eedbfa49f004e65da1ab2a06 Mon Sep 17 00:00:00 2001
From 2f75911f11ee50eb4f5cebfbc040042270e54e2f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 16:36:55 -0500
Subject: [PATCH] ItemFactory#getMonsterEgg
@@ -22,10 +22,10 @@ index 6d8321080..793e42072 100644
private final int c;
private final EntityTypes<?> d;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index d56f8ca6a..082b77f15 100644
index c28691ae6..616c3e8e4 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -347,4 +347,18 @@ public final class CraftItemFactory implements ItemFactory {
@@ -349,4 +349,18 @@ public final class CraftItemFactory implements ItemFactory {
return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
}
// Paper end

6
patches/server/0032-Fix-vanilla-command-permission-handler.patch
View File

@@ -1,4 +1,4 @@
From 7627086a8214c93b0a9c2e61981377aeb30553c1 Mon Sep 17 00:00:00 2001
From 0efc3418e55cf91ac4cfedd251486777e746768d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 28 Mar 2020 01:51:32 -0500
Subject: [PATCH] Fix vanilla command permission handler
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix vanilla command permission handler
2 files changed, 2 insertions(+)
diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
index bd2802d36..5fa2a45c8 100644
index 5e3fc338b..b3835c3c7 100644
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
@@ -34,6 +34,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
@@ -35,6 +35,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
private final RedirectModifier<S> modifier;
private final boolean forks;
private Command<S> command;