Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@27516ee Temp fix for EntityType.translationKey
PaperMC/Paper@8fced9d [ci skip] Update paperweight to 1.5.1 (#8856)
PaperMC/Paper@f9dc371 Fix calling UnknownCommandEvent (#8232)
This commit is contained in:
granny
2023-02-17 03:20:27 -08:00
parent fccccfa194
commit 41593baf70
19 changed files with 55 additions and 55 deletions

View File

@@ -17,10 +17,10 @@ index c7e4330c93baff1f3027d7c75cf857b673d38970..5134fed0cd0eedbe0c2177bce91b978b
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 37b4f6ec19ef2c847214e127c258e1b82b4c2c1d..f50e2ebef64652f5fb396676dbc245692da2443f 100644
index 0fcc3685f3f5b5c81a85f6981541f2cecc386da3..45f75ebc00f0e371066bb244a61c8d68a57c68c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2959,4 +2959,11 @@ public final class CraftServer implements Server {
@@ -2960,4 +2960,11 @@ public final class CraftServer implements Server {
}
// Paper end