9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-30 20:29:23 +00:00

Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
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
This commit is contained in:
Dreeam
2024-10-22 09:19:04 -04:00
parent 5fffc5ef30
commit e893e3d762
11 changed files with 39 additions and 40 deletions

View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6bd5dc6de7f56cefb7f8cc7a72553bd8ac81d68f..5dbaaa949976051d7926fe24203777bd66f9189c 100644
index c0e1ba2815867b0cf08a770de706c3a210c4ffad..d2cc2d8ce298621c1e2f197ce260ab0174d0948f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3269,4 +3269,22 @@ public final class CraftServer implements Server {
@@ -3271,4 +3271,22 @@ public final class CraftServer implements Server {
return this.potionBrewer;
}
// Paper end