mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 333b9f02 SPIGOT-5422: Add support for 3-dimensional biomes 170d7386 Fix bad link in deprecated FlowerPot MaterialData class CraftBukkit Changes:16dc5758
SPIGOT-5449: Fix issue with projectilesfd25653f
SPIGOT-5448: Shulker Boxes collapse empty slots when picked upb97d581a
SPIGOT-5443: BEE_NEST BlockState73698cf8
SPIGOT-5442: Fix issue with fire chargesbeff9fb9
SPIGOT-5437: Fix CustomChunkGenerator.CustomBiomeGrid ignoring the y value for biomesf777640e
SPIGOT-5425: Prevent empty/air loot (again?)db0dafb1
SPIGOT-5422: Add support for 3-dimensional biomes4633e6c5
Fix crash with disabled worlds Spigot Changes: f39a89ef SPIGOT-5423: Remove covariant type change to give better chance of Java downgrades working
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 8265eef5c89938c66997f160170ef15c83912669 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 4 May 2016 22:43:12 -0400
|
|
Subject: [PATCH] Implement ensureServerConversions API
|
|
|
|
This will take a Bukkit ItemStack and run it through any conversions a server process would perform on it,
|
|
to ensure it meets latest minecraft expectations.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
index 01ab19434..8b219b5fa 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
|
@@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory {
|
|
public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
|
|
return ((CraftMetaItem) meta).updateMaterial(material);
|
|
}
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public ItemStack ensureServerConversions(ItemStack item) {
|
|
+ return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.24.1
|
|
|