Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3aec863 Add BlockLockCheckEvent (#7840)
PaperMC/Paper@0262de0 Deprecate TargetBlock/EntityInfo and assocated methods (#7381)
PaperMC/Paper@28c7d40 Add Sneaking API for Entities (#8485)
PaperMC/Paper@262c08f Updated Upstream (CraftBukkit) (#8680)
This commit is contained in:
BillyGalbreath
2022-12-16 10:40:50 -06:00
parent ed3d48efcf
commit 7062a32f8f
28 changed files with 65 additions and 65 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 fb290333f407776e732d3588233a35afa2ab989c..4a3025635de5f5f889e642fe10dd0b7ba7ec39d2 100644
index 7d97c45ee5bf9cbb17f3d8658ab43e18c21bd7ff..e33bf6cb8a87717af24515fb0ce9f2bb8139eecd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2955,4 +2955,11 @@ public final class CraftServer implements Server {
@@ -2958,4 +2958,11 @@ public final class CraftServer implements Server {
}
// Paper end