Updated Upstream (Bukkit/CraftBukkit)

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:
122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches
a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType()

CraftBukkit Changes:
bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException
3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches
95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType()
4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
This commit is contained in:
Aikar 2020-04-02 17:07:06 -04:00
parent c867045d3c
commit e4d10a6d67
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
653 changed files with 2156 additions and 2156 deletions

View file

@ -1,4 +1,4 @@
From 3f4a17835ea5512030e329f447171e75323f9bf9 Mon Sep 17 00:00:00 2001
From 50e776a94f7520476e8899ecd8573b261c0fc06e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] Add getI18NDisplayName API
@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
You must replace the language file embedded in the server jar.
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index bb3f7cdc..3cada348 100644
index bb3f7cdc1..3cada3487 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -153,5 +153,16 @@ public interface ItemFactory {
@ -29,7 +29,7 @@ index bb3f7cdc..3cada348 100644
// Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index ca6d1233..8adf9399 100644
index 07aa65d1a..e9ba31152 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -609,5 +609,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@ -51,5 +51,5 @@ index ca6d1233..8adf9399 100644
// Paper end
}
--
2.25.0
2.25.1