mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
adf463a0af
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)
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
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
|
|
|
|
---
|
|
.../java/net/minecraft/server/ItemMonsterEgg.java | 2 +-
|
|
.../craftbukkit/inventory/CraftItemFactory.java | 14 ++++++++++++++
|
|
2 files changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
|
index 6d8321080..793e42072 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
|
@@ -9,7 +9,7 @@ import javax.annotation.Nullable;
|
|
|
|
public class ItemMonsterEgg extends Item {
|
|
|
|
- private static final Map<EntityTypes<?>, ItemMonsterEgg> a = Maps.newIdentityHashMap();
|
|
+ public static final Map<EntityTypes<?>, ItemMonsterEgg> a = Maps.newIdentityHashMap(); // Purpur - private -> public
|
|
private final int b;
|
|
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 c28691ae6..616c3e8e4 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
@@ -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
|
|
+
|
|
+ // Purpur start
|
|
+ @Override
|
|
+ public ItemStack getMonsterEgg(org.bukkit.entity.EntityType type) {
|
|
+ if (type == null) {
|
|
+ return null;
|
|
+ }
|
|
+ String name = type.getKey().toString();
|
|
+ net.minecraft.server.MinecraftKey key = new net.minecraft.server.MinecraftKey(name);
|
|
+ net.minecraft.server.EntityTypes types = net.minecraft.server.EntityTypes.getFromKey(key);
|
|
+ net.minecraft.server.ItemMonsterEgg egg = net.minecraft.server.ItemMonsterEgg.a.get(types);
|
|
+ return new net.minecraft.server.ItemStack(egg).asBukkitMirror();
|
|
+ }
|
|
+ // Purpur end
|
|
}
|
|
--
|
|
2.26.2
|
|
|