Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
0399d9d6 SPIGOT-5341: Add Material.isAir
547f5709 SPIGOT-5353: Expand explosion API by adding source entity

CraftBukkit Changes:
7deb3728 SPIGOT-5309: Call cancelled EntityDamageEvent when damaging invisible armor stands
46351e17 SPIGOT-5341: Add Material.isAir
683bae06 SPIGOT-5342: Lore lost when deserializing items with no version stored
c2d12011 SPIGOT-5353: Expand explosion API by adding source entity
This commit is contained in:
Shane Freeder
2019-10-08 19:37:02 +01:00
parent 3398704d7f
commit e8c82f4eee
30 changed files with 196 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0409-Asynchronous-chunk-IO-and-loading.patch
View File

@@ -1,4 +1,4 @@
From 25eb4ce4491f0ab4ed97614dc5de32690bd815fb Mon Sep 17 00:00:00 2001
From ae661062cff3c42c981166ace8b1e63eaa43595d Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:23:10 -0700
Subject: [PATCH] Asynchronous chunk IO and loading
@@ -3801,10 +3801,10 @@ index f1ad7be754..0c1f4e6e1e 100644
public void doTick(BooleanSupplier booleansupplier) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 4a035f0f0b..3d5aa7e8d9 100644
index 2227de3bf1..243722b672 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -553,22 +553,23 @@ public class CraftWorld implements World {
@@ -554,22 +554,23 @@ public class CraftWorld implements World {
return true;
}
@@ -3836,7 +3836,7 @@ index 4a035f0f0b..3d5aa7e8d9 100644
// fall through to load
// we do this so we do not re-read the chunk data on disk
@@ -2325,6 +2326,25 @@ public class CraftWorld implements World {
@@ -2344,6 +2345,25 @@ public class CraftWorld implements World {
return persistentRaid.a.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}
@@ -3891,5 +3891,5 @@ index a1d93200e6..6ca0ebfdee 100644
log.log( Level.SEVERE, "------------------------------" );
//
--
2.22.1
2.23.0