mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@431e641 Fixup player profile getters and constructor to expected nullability (#9770) PaperMC/Paper@cfe311d Fix item effects conversion if no tag is present
This commit is contained in:
@@ -25,10 +25,10 @@ index d0f0b17f4071ca716a3f3361bf1080b9607e4e04..b064e88913e932d070f36dd3f4832f63
|
||||
}
|
||||
// Spigot end
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 95cda82554bcf888b0a94ba8f122a8a9bb2a5582..badcaf433d9862ce1b74cb283cd5151f968aab82 100644
|
||||
index 7c74102cfa293a1549b47907ec59367b55db6791..00f80e8722e69c06c79bb17090812a04c6590d1d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -3148,5 +3148,10 @@ public final class CraftServer implements Server {
|
||||
@@ -3153,5 +3153,10 @@ public final class CraftServer implements Server {
|
||||
public String getServerName() {
|
||||
return this.getProperties().serverName;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user