Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +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:
7ce690f4 [Auto] Updated Upstream (Bukkit/CraftBukkit)
bcab622e [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-06-30 21:07:26 -05:00
parent ce403193df
commit 2878dc4f57
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 38fdad1ea7b019df25e4e4d00c6f0776795bc7e1 Mon Sep 17 00:00:00 2001
From ca23ccf9910f7575eedbfa49f004e65da1ab2a06 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 0d62f3ae9..53038d096 100644
index d56f8ca6a..082b77f15 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -345,4 +345,18 @@ public final class CraftItemFactory implements ItemFactory {
@@ -347,4 +347,18 @@ public final class CraftItemFactory implements ItemFactory {
return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
}
// Paper end