Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
9623b5f19 [CI-SKIP] [Auto] Rebuild Patches
fe5f035db Fix CraftSound backwards compatibility
This commit is contained in:
BillyGalbreath
2020-12-18 10:16:18 -06:00
parent 69c6484904
commit 2ec0dbab59
6 changed files with 1 additions and 22 deletions

2
Paper

Submodule Paper updated: fb36f15d6c...9623b5f19c

View File

@@ -1,21 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Thu, 10 Dec 2020 21:41:24 -0600
Subject: [PATCH] Fix CraftSound backwards compatibility
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
index a7137123f698929263d342d5f8da1b34be3c9d5e..c45fd46c11c1b544daa07da9bba4179050bf6785 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
@@ -27,4 +27,10 @@ public class CraftSound {
public static Sound getBukkit(SoundEffect soundEffect) {
return Registry.SOUNDS.get(CraftNamespacedKey.fromMinecraft(IRegistry.SOUND_EVENT.getKey(soundEffect)));
}
+
+ // Purpur start
+ public static String getSound(Sound sound) {
+ return sound.getKey().getKey();
+ }
+ // Purpur end
}