all patches applied \o/

patches/server/0055-Add-canSaveToDisk-to-Entity.patch

@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 18 Feb 2020 20:07:08 -0600
-Subject: [PATCH] Add canSaveToDisk to Entity
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1d5037594599392e133ca593f58f9d823725c9d6..63609c4ff4695753b318e345b2ef9047e7cadf1c 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -493,6 +493,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         return false;
-     }
- 
-+    public boolean canSaveToDisk() {
-+        return true;
-+    }
-+
-     public final boolean hardCollides() {
-         return this.hardCollides;
-     }
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-index 937f57d8af629c4e913d7ccabf6adab15f91d3d0..f40ab9d5b18c189ba9b572e49243640bd44362d1 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-@@ -115,6 +115,11 @@ public class WitherSkull extends AbstractHurtingProjectile {
-         return target != this.getRider() && super.canHitEntity(target);
-     }
- 
-+    @Override
-+    public boolean canSaveToDisk() {
-+        return false;
-+    }
-+
-     @Override
-     public boolean isPickable() {
-         return false;
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 060e064625969610539dbf969ce773b877a7c579..32cd9df202704cdfb8fa06aaf0e738d483054feb 100644
---- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-@@ -112,6 +112,7 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
-         ListTag listTag = new ListTag();
-         final java.util.Map<net.minecraft.world.entity.EntityType<?>, Integer> savedEntityCounts = new java.util.HashMap<>(); // Paper
-         entities.forEach((entity) -> { // diff here: use entities parameter
-+            if (!entity.canSaveToDisk()) return; // Purpur
-             // Paper start
-             final EntityType<?> entityType = entity.getType();
-             final int saveLimit = level.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
-diff --git a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-index af057c1d7fd74f3dd806c5ce7f8b0ad06cab7b8e..ce614ae6b1fa0b31c1ee8dacb69134bb20c949f4 100644
---- a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-+++ b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-@@ -35,6 +35,13 @@ public class DolphinSpit extends LlamaSpit {
-                 dolphin.getZ() + (double) (dolphin.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(dolphin.yBodyRot * 0.017453292F));
-     }
- 
-+    // Purpur start
-+    @Override
-+    public boolean canSaveToDisk() {
-+        return false;
-+    }
-+    // Purpur end
-+
-     public void tick() {
-         super_tick();
- 
-diff --git a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
-index 1fd6412e332ea8ee82b19c108e113624e51d764b..ea8b928b6d82689e71bbcc39ab497491072dfba6 100644
---- a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
-+++ b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
-@@ -38,6 +38,13 @@ public class PhantomFlames extends LlamaSpit {
-                 phantom.getZ() + (double) (phantom.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(phantom.yBodyRot * 0.017453292F));
-     }
- 
-+    // Purpur start
-+    @Override
-+    public boolean canSaveToDisk() {
-+        return false;
-+    }
-+    // Purpur end
-+
-     public void tick() {
-         super_tick();
-