Skip to content

fix: 优化非持枪生物 Tick 与实体同步队列 #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YAMADA-SAMA wants to merge 1 commit into
base: 1.20.1-dev-temp
Choose a base branch
from
Open

fix: 优化非持枪生物 Tick 与实体同步队列 #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/main/java/com/tacz/guns/entity/sync/core/SyncedEntityData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class SyncedEntityData {

private final AtomicInteger nextIdTracker = new AtomicInteger();
private final List<Entity> dirtyEntities = new ArrayList<>();
private final Set<Entity> dirtyEntitySet = Collections.newSetFromMap(new IdentityHashMap<>());
private boolean dirty = false;

private SyncedEntityData() {
Expand Down Expand Up @@ -101,7 +102,9 @@ public <E extends Entity, T> void set(E entity, SyncedDataKey<?, ?> key, T value
if (holder != null && holder.set(entity, key, value)) {
if (!entity.level().isClientSide()) {
this.dirty = true;
this.dirtyEntities.add(entity);
if (this.dirtyEntitySet.add(entity)) {
this.dirtyEntities.add(entity);
}
}
}
}
Expand Down Expand Up @@ -242,4 +245,9 @@ public void setDirty(boolean dirty) {
public List<Entity> getDirtyEntities() {
return dirtyEntities;
}

public void clearDirtyEntities() {
this.dirtyEntities.clear();
this.dirtyEntitySet.clear();
}
}
5 changes: 3 additions & 2 deletions src/main/java/com/tacz/guns/event/SyncedEntityDataEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public static void onServerTick(TickEvent.ServerTickEvent event) {
}
List<Entity> dirtyEntities = instance.getDirtyEntities();
if (dirtyEntities.isEmpty()) {
instance.clearDirtyEntities();
instance.setDirty(false);
return;
}
Expand All @@ -122,7 +123,7 @@ public static void onServerTick(TickEvent.ServerTickEvent event) {
}
holder.clean();
}
dirtyEntities.clear();
instance.clearDirtyEntities();
instance.setDirty(false);
}
}
}
14 changes: 12 additions & 2 deletions src/main/java/com/tacz/guns/mixin/common/LivingEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
import com.tacz.guns.api.entity.KnockBackModifier;
import com.tacz.guns.api.entity.ReloadState;
import com.tacz.guns.api.entity.ShootResult;
import com.tacz.guns.api.item.IGun;
import com.tacz.guns.entity.shooter.*;
import com.tacz.guns.entity.sync.ModSyncedEntityData;
import com.tacz.guns.resource.modifier.AttachmentCacheProperty;
import com.tacz.guns.resource.modifier.AttachmentPropertyManager;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import org.spongepowered.asm.mixin.Mixin;
Expand Down Expand Up @@ -217,8 +219,9 @@ public void zoom() {

@Inject(method = "tick", at = @At(value = "RETURN"))
private void onTickServerSide(CallbackInfo ci) {
// 仅在服务端调用
if (!level().isClientSide()) {
// 普通生物不需要执行完整的枪械状态机。
// 玩家始终保持激活；持枪或已被第三方初始化的生物也保持原有行为。
if (!level().isClientSide() && this.tacz$shouldTickGunLogic()) {
// 完成各种 tick 任务
ReloadState reloadState = this.tacz$reload.tickReloadState();
this.tacz$aim.tickAimingProgress();
Expand All @@ -241,6 +244,13 @@ private void onTickServerSide(CallbackInfo ci) {
}
}

@Unique
private boolean tacz$shouldTickGunLogic() {
return this.tacz$shooter instanceof Player
|| this.tacz$data.currentGunItem != null
|| this.tacz$shooter.getMainHandItem().getItem() instanceof IGun;
}

@Override
@Unique
public void resetKnockBackStrength() {
Expand Down