mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
1d3f710297
Upstream has released updates that appear to apply and compile correctly Paper Changes: 840e72091 [CI-SKIP] [Auto] Rebuild Patches a33232d4a Add beacon activation and deactivation events (#5121) bc7ea673a Add internal channel initialization listeners (#5557) b28ad17ac Check for world change in MoveEvent API methods 3095c7592 [Auto] Updated Upstream (CraftBukkit) f56989c97 Add RespawnFlags to PlayerRespawnEvent (#5533) 7579c2667 Add more API to PlayerMoveEvent (#5553)
43 lines
2.2 KiB
Diff
43 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 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
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/ItemMonsterEgg.java b/src/main/java/net/minecraft/world/item/ItemMonsterEgg.java
|
|
index 4d965e504a40eb52777575df839856c825a0900a..addddb64956c63563fc072b35cc511d31c9afd45 100644
|
|
--- a/src/main/java/net/minecraft/world/item/ItemMonsterEgg.java
|
|
+++ b/src/main/java/net/minecraft/world/item/ItemMonsterEgg.java
|
|
@@ -35,7 +35,7 @@ import net.minecraft.world.phys.Vec3D;
|
|
|
|
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 6966b9d1ce674232d3f867798fa58bd0933ff69e..1cc473eb4d346b1b498a7b170973fb44d8b8aea6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
@@ -396,4 +396,18 @@ public final class CraftItemFactory implements ItemFactory {
|
|
new net.md_5.bungee.api.chat.TextComponent(customName));
|
|
}
|
|
// 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.resources.MinecraftKey key = new net.minecraft.resources.MinecraftKey(name);
|
|
+ net.minecraft.world.entity.EntityTypes types = net.minecraft.world.entity.EntityTypes.getFromKey(key);
|
|
+ net.minecraft.world.item.ItemMonsterEgg egg = net.minecraft.world.item.ItemMonsterEgg.a.get(types);
|
|
+ return new net.minecraft.world.item.ItemStack(egg).asBukkitMirror();
|
|
+ }
|
|
+ // Purpur end
|
|
}
|