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
653 changed files with 2156 additions and 2156 deletions

View File

@@ -1,14 +1,14 @@
From 7e722bdbd8f3b45278cb3a069b09aa82a50cceda Mon Sep 17 00:00:00 2001
From 58de6a67866af196b860dcce47831eb71f05dd25 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 6 Oct 2018 21:14:29 -0400
Subject: [PATCH] Material API additions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 9dc0ed03..535179c2 100644
index f28da6efd..1f2dbd68c 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -81,6 +81,7 @@ import org.jetbrains.annotations.Nullable;
@@ -82,6 +82,7 @@ import org.jetbrains.annotations.Nullable;
/**
* An enum of all material IDs accepted by the official server and client
*/
@@ -16,7 +16,7 @@ index 9dc0ed03..535179c2 100644
public enum Material implements Keyed {
//<editor-fold desc="Materials" defaultstate="collapsed">
ACACIA_BOAT(27326, 1),
@@ -3305,6 +3306,22 @@ public enum Material implements Keyed {
@@ -3306,6 +3307,22 @@ public enum Material implements Keyed {
}
}
@@ -40,5 +40,5 @@ index 9dc0ed03..535179c2 100644
* Do not use for any reason.
*
--
2.25.0.windows.1
2.25.1