mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (CraftBukkit)

Browse source 
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

CraftBukkit Changes:
17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI
0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work
bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
This commit is contained in:
Spottedleaf 2019-06-06 08:36:57 -07:00 • committed by Shane Freeder
parent 4ff5387091
commit 2f782a6652
583 changed files with 1650 additions and 1650 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Spigot-API-Patches/0154-Material-API-additions.patch
View file

@ -1,11 +1,11 @@
From ca41b95550077f665eafda0196e09f76153f6a86 Mon Sep 17 00:00:00 2001
From 5cfd6d8b87b933622537b885a63adafe69245b0b 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 b9838dc9..9a1c3724 100644
index b9838dc96..9a1c37248 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -80,6 +80,7 @@ import org.jetbrains.annotations.Nullable;