Remove Force Despawn API, Fix #23

PrismarineTeam · Nov 12, 2022 · 1e9bec9 · 1e9bec9
1 parent 69d16d0
commit 1e9bec9
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 117 deletions.
diff --git a/patches/api/0009-Force-despawn-API.patch b/patches/api/0009-Force-despawn-API.patch
diff --git a/patches/server/0009-JettPack-Server-Patches.patch b/patches/server/0009-JettPack-Server-Patches.patch
@@ -935,30 +935,6 @@ index 1ec9a48f2f44f5bd647e0661423ae90970aee262..5b5e91a4fd837093d012845a9024a588
          int i = this.getCurrentSwingDuration();
 
          if (this.swinging) {
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d5e3bd662da349fc2ee58c7800d79c60300f33b3..920318f80256632a8b6ac430e18ea470dfbfba37 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -841,9 +841,6 @@ public abstract class Mob extends LivingEntity {
-         } else if (!this.isPersistenceRequired() && !this.requiresCustomPersistence()) {
-             // Paper start - optimise checkDespawn
-             Player entityhuman = this.level.findNearbyPlayer(this, level.paperConfig().entities.spawning.despawnRanges.get(this.getType().getCategory()).hard() + 1, EntitySelector.affectsSpawning); // Paper
--            if (entityhuman == null) {
--                entityhuman = ((ServerLevel)this.level).playersAffectingSpawning.isEmpty() ? null : ((ServerLevel)this.level).playersAffectingSpawning.get(0);
--            }
-             // Paper end - optimise checkDespawn
-
-             if (entityhuman != null) {
-@@ -864,6 +861,9 @@ public abstract class Mob extends LivingEntity {
-                     this.noActionTime = 0;
-                 }
-             }
-+            else {
-+                this.discard(); // Paper - no entity found on hardDespawnDistance, we should discard it // Prismarine - JettPack patches
-+            }
-
-         } else {
-             this.noActionTime = 0;
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 index 00fc98797aea23e1f586b8e7f85fc27e2019352f..d281138a381a516804eef0da9dabd27e1e92145f 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java

diff --git a/patches/server/0028-Force-despawn-API.patch b/patches/server/0028-Force-despawn-API.patch
diff --git a/...d-option-to-fix-creative-mode-actio.patch → ...d-option-to-fix-creative-mode-actio.patch b/...d-option-to-fix-creative-mode-actio.patch → ...d-option-to-fix-creative-mode-actio.patch
diff --git a/...d-attribute-clamping-and-armor-limi.patch → ...d-attribute-clamping-and-armor-limi.patch b/...d-attribute-clamping-and-armor-limi.patch → ...d-attribute-clamping-and-armor-limi.patch
diff --git a/...-Configurable-armor-attribute-limit.patch → ...-Configurable-armor-attribute-limit.patch b/...-Configurable-armor-attribute-limit.patch → ...-Configurable-armor-attribute-limit.patch
diff --git a/patches/server/0032-No-Bedrock-Option.patch → patches/server/0031-No-Bedrock-Option.patch b/patches/server/0032-No-Bedrock-Option.patch → patches/server/0031-No-Bedrock-Option.patch
diff --git a/...033-Toggleable-offline-mode-warning.patch → ...032-Toggleable-offline-mode-warning.patch b/...033-Toggleable-offline-mode-warning.patch → ...032-Toggleable-offline-mode-warning.patch
diff --git a/...er/0034-Implement-Anti-Shulker-Dupe.patch → ...er/0033-Implement-Anti-Shulker-Dupe.patch b/...er/0034-Implement-Anti-Shulker-Dupe.patch → ...er/0033-Implement-Anti-Shulker-Dupe.patch
diff --git a/patches/server/0035-Fix-MC-252817.patch → patches/server/0034-Fix-MC-252817.patch b/patches/server/0035-Fix-MC-252817.patch → patches/server/0034-Fix-MC-252817.patch