Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (CraftBukkit/Spigot) (#5169)

Browse Source
This commit is contained in:
Mariell Hoversholm
2021-02-05 23:52:27 +01:00
committed by GitHub
parent 002f65b8b8
commit 8bc0c6c318
107 changed files with 340 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0130-String-based-Action-Bar-API.patch
View File

@@ -18,10 +18,10 @@ index bdfd17362518ff2398cf9e1743a7a4f0c7a0e966..cc14e4b4609fa7013df666181c0e02a5
public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> a() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f447059d0eecf68c44a74f27acd726f9355c4bd7..023bcc56e8c27d9660dadd90e074f64b75159d25 100644
index 0c2637ae7e01535088bf9177f5ccf1b1bade98e9..7823ddab7f0bf9b1096cf4a3d54324e8bbb86a09 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -244,6 +244,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -243,6 +243,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start