mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
01a13871de
Patch documentation to come Issues with the old system that are fixed now: - World generation does not scale with cpu cores effectively. - Relies on the main thread for scheduling and maintaining chunk state, dropping chunk load/generate rates at lower tps. - Unreliable prioritisation of chunk gen/load calls that block the main thread. - Shutdown logic is utterly unreliable, as it has to wait for all chunks to unload - is it guaranteed that the chunk system is in a state on shutdown that it can reliably do this? Watchdog shutdown also typically failed due to thread checks, which is now resolved. - Saving of data is not unified (i.e can save chunk data without saving entity data, poses problems for desync if shutdown is really abnormal. - Entities are not loaded with chunks. This caused quite a bit of headache for Chunk#getEntities API, but now the new chunk system loads entities with chunks so that they are ready whenever the chunk loads in. Effectively brings the behavior back to 1.16 era, but still storing entities in their own separate regionfiles. The above list is not complete. The patch documentation will complete it. New chunk system hard relies on starlight and dataconverter, and most importantly the new concurrent utilities in ConcurrentUtil. Some of the old async chunk i/o interface (i.e the old file io thread reroutes _some_ calls to the new file io thread) is kept for plugin compat reasons. It will be removed in the next major version of minecraft. The old legacy chunk system patches have been moved to the removed folder in case we need them again.
59 lines
3.7 KiB
Diff
59 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 3 Jul 2020 15:03:33 -0700
|
|
Subject: [PATCH] Improve EntityTargetLivingEntityEvent for 1.16 mobs
|
|
|
|
CraftBukkit has a bug in their implementation and is incorrectly handling forget
|
|
Also adds more target reasons for why it forgot target.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
|
|
index 44d3c9da39389b72bfc5ee39c1abb6baf9dccdb1..565691aaed71de3efe15dd751fbbbe7849ef56b7 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java
|
|
@@ -56,15 +56,15 @@ public class StopAttackingIfTargetInvalid<E extends Mob> extends Behavior<E> {
|
|
LivingEntity entityliving = this.getAttackTarget(entity);
|
|
|
|
if (!entity.canAttack(entityliving)) {
|
|
- this.clearAttackTarget(entity);
|
|
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_INVALID); // Paper
|
|
} else if (this.canGrowTiredOfTryingToReachTarget && StopAttackingIfTargetInvalid.isTiredOfTryingToReachTarget(entity)) {
|
|
- this.clearAttackTarget(entity);
|
|
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FORGOT_TARGET); // Paper
|
|
} else if (this.isCurrentTargetDeadOrRemoved(entity)) {
|
|
- this.clearAttackTarget(entity);
|
|
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_DIED); // Paper
|
|
} else if (this.isCurrentTargetInDifferentLevel(entity)) {
|
|
- this.clearAttackTarget(entity);
|
|
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_OTHER_LEVEL); // Paper
|
|
} else if (this.stopAttackingWhen.test(this.getAttackTarget(entity))) {
|
|
- this.clearAttackTarget(entity);
|
|
+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_INVALID); // Paper
|
|
}
|
|
}
|
|
|
|
@@ -88,17 +88,20 @@ public class StopAttackingIfTargetInvalid<E extends Mob> extends Behavior<E> {
|
|
return optional.isPresent() && !((LivingEntity) optional.get()).isAlive();
|
|
}
|
|
|
|
- protected void clearAttackTarget(E entity) {
|
|
+ protected void clearAttackTarget(E entity, EntityTargetEvent.TargetReason reason) {
|
|
// CraftBukkit start
|
|
- LivingEntity old = entity.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null);
|
|
- EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entity, null, (old != null && !old.isAlive()) ? EntityTargetEvent.TargetReason.TARGET_DIED : EntityTargetEvent.TargetReason.FORGOT_TARGET);
|
|
+ // Paper start - fix this event
|
|
+ // LivingEntity old = entity.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null);
|
|
+ EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entity, null, reason);
|
|
if (event.isCancelled()) {
|
|
return;
|
|
}
|
|
- if (event.getTarget() != null) {
|
|
+ // comment out, bad logic - bad
|
|
+ /*if (event.getTarget() != null) {
|
|
entity.getBrain().setMemory(MemoryModuleType.ATTACK_TARGET, ((CraftLivingEntity) event.getTarget()).getHandle());
|
|
return;
|
|
- }
|
|
+ }*/
|
|
+ // Paper end
|
|
// CraftBukkit end
|
|
this.onTargetErased.accept(entity, this.getAttackTarget(entity));
|
|
entity.getBrain().eraseMemory(MemoryModuleType.ATTACK_TARGET);
|