Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit)
a23be44da [Auto] Updated Upstream (CraftBukkit)
e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945)
d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent
24388381a Fix lead duplication

Tuinity Changes:
09423b6 Update to Starlight 0.0.2-RC3
f06591a Update Upstream (Paper)
d2aa70f Revert special block lookup for chunksection
This commit is contained in:
BillyGalbreath
2020-12-28 01:21:49 -06:00
parent 7152b72d25
commit 3d455ff2d5
41 changed files with 2405 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0071-Add-canSaveToDisk-to-Entity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 3628b04fc4f4f4663b3780eadac6ff9e430e4900..b40cb0c7b25a9ef25dddcf01ab7b5e97fe68655d 100644
index 423da11d4910bbe12625ec5a16edfd6e80cd3dea..77f31dc1e45b438ece691617deb17d7a5fbbc94b 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -532,6 +532,7 @@ public class ChunkRegionLoader {
@@ -525,6 +525,7 @@ public class ChunkRegionLoader {
while (iterator1.hasNext()) {
Entity entity = (Entity) iterator1.next();
@@ -17,7 +17,7 @@ index 3628b04fc4f4f4663b3780eadac6ff9e430e4900..b40cb0c7b25a9ef25dddcf01ab7b5e97
final EntityTypes<?> projectileType = entity.getEntityType();
if (savedProjectileCounts.getOrDefault(projectileType, 0) >= worldserver.paperConfig.projectileSaveLimit) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc..ca7189dbf4f8e71163de55ee89cad15390744f96 100644
index cbdfc8d929f9419d49b0642e8cfc7219741e0e38..85f7c97136195bd7c77685244e89ceedec72dee5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke