mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (CraftBukkit) (#7105)

Browse source
This commit is contained in:
Jake Potrebic 2021-12-12 19:59:43 -08:00 • committed by GitHub
parent 91f3edaac4
commit c1bd3cc8fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 56 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0657-Add-basic-Datapack-API.patch
View file

@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 203ba9f883941cd4f421b2c53ee153ecc02cd16c..c1a28d8d52afcfd60223b59107ce92e1037f5ba6 100644
index 8a4c15afceb96e319b80b7506e401f60275b5116..8fe8a761b76972fbc586fa7bb3e08fbeabd5bda0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -290,6 +290,7 @@ public final class CraftServer implements Server {
@ -111,7 +111,7 @@ index 203ba9f883941cd4f421b2c53ee153ecc02cd16c..c1a28d8d52afcfd60223b59107ce92e1
}
public boolean getCommandBlockOverride(String command) {
@@ -2686,5 +2688,11 @@ public final class CraftServer implements Server {
@@ -2680,5 +2682,11 @@ public final class CraftServer implements Server {
public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
return mobGoals;
}