mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-27 19:09:22 +00:00
Updated Upstream (Paper/Gale)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@755a775 [ci skip] rebuild patches PaperMC/Paper@3b9db2b Updated Upstream (Bukkit/CraftBukkit) (#11501) PaperMC/Paper@c13f9fd Fix potential annotation testing interruption (#11460) PaperMC/Paper@260c3bb Always send Banner patterns to the client (#11506) PaperMC/Paper@14a48cd Some small touchups to the GUI (#11505) PaperMC/Paper@d348cb8 Restrict BlockProjectileSource#launchProjectile Gale Changes: Dreeam-qwq/Gale@e893e3d Updated Upstream (Paper)
This commit is contained in:
@@ -415,7 +415,7 @@ index df9f87ff656dbc80f934f35ff45e6de5905f7b7e..509cf388b501fc446dc9bcd8e79bd701
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index b1d269588f7df320d079f1456ffc188bf8af1716..bdecd0fdd56f91072fc2eb5768857a607b40bbb9 100644
|
||||
index c872b29c638cb8a2bd2fa021398dd5d886928b94..1628f125f82d3dcffcf6b11ce4dbf27ba3fafe63 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -320,6 +320,8 @@ public final class CraftServer implements Server {
|
||||
@@ -436,7 +436,7 @@ index b1d269588f7df320d079f1456ffc188bf8af1716..bdecd0fdd56f91072fc2eb5768857a60
|
||||
@Override
|
||||
public CraftPlayer apply(ServerPlayer player) {
|
||||
return player.getBukkitEntity();
|
||||
@@ -3375,4 +3377,11 @@ public final class CraftServer implements Server {
|
||||
@@ -3377,4 +3379,11 @@ public final class CraftServer implements Server {
|
||||
return getServer().lagging;
|
||||
}
|
||||
// Purpur end
|
||||
|
||||
Reference in New Issue
Block a user