mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-22 08:19:26 +00:00
877990205f
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@eef40b7 Configurable Entity Despawn Time (#11454) PaperMC/Paper@edabff8 Correctly damage tick wolf after armor block (#11653) PaperMC/Paper@6051dac Painting variant registry modification API (#11648) PaperMC/Paper@bb32b05 Call ProjectileHitEvent for entity hits (#11652) PaperMC/Paper@bf8405f [ci skip] Rebuild patches
96 lines
4.1 KiB
Diff
96 lines
4.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
|
|
Date: Wed, 16 Aug 2023 22:34:49 +0100
|
|
Subject: [PATCH] Store Entity Data/State
|
|
|
|
|
|
diff --git a/src/main/java/me/samsuik/sakura/entity/EntityState.java b/src/main/java/me/samsuik/sakura/entity/EntityState.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..aeb5f128b369753cb20b7310fa382ddf2b6e8f0f
|
|
--- /dev/null
|
|
+++ b/src/main/java/me/samsuik/sakura/entity/EntityState.java
|
|
@@ -0,0 +1,41 @@
|
|
+package me.samsuik.sakura.entity;
|
|
+
|
|
+import net.minecraft.core.BlockPos;
|
|
+import net.minecraft.world.entity.Entity;
|
|
+import net.minecraft.world.level.block.Blocks;
|
|
+import net.minecraft.world.phys.AABB;
|
|
+import net.minecraft.world.phys.Vec3;
|
|
+import org.jspecify.annotations.NullMarked;
|
|
+
|
|
+import java.util.Optional;
|
|
+
|
|
+@NullMarked
|
|
+public record EntityState(Vec3 position, Vec3 momentum, AABB bb, Vec3 stuckSpeed, Optional<BlockPos> supportingPos, boolean onGround, float fallDistance) {
|
|
+ public static EntityState of(Entity entity) {
|
|
+ return new EntityState(
|
|
+ entity.position(), entity.getDeltaMovement(), entity.getBoundingBox(),
|
|
+ entity.stuckSpeedMultiplier(), entity.mainSupportingBlockPos,
|
|
+ entity.onGround(), entity.fallDistance
|
|
+ );
|
|
+ }
|
|
+
|
|
+ public void apply(Entity entity) {
|
|
+ entity.setPos(this.position);
|
|
+ entity.setDeltaMovement(this.momentum);
|
|
+ entity.setBoundingBox(this.bb);
|
|
+ entity.makeStuckInBlock(Blocks.AIR.defaultBlockState(), this.stuckSpeed);
|
|
+ entity.onGround = this.onGround;
|
|
+ entity.mainSupportingBlockPos = this.supportingPos;
|
|
+ entity.fallDistance = this.fallDistance;
|
|
+ }
|
|
+
|
|
+ public void applyEntityPosition(Entity entity) {
|
|
+ entity.setPos(this.position);
|
|
+ entity.setBoundingBox(this.bb);
|
|
+ }
|
|
+
|
|
+ public boolean comparePositionAndMotion(Entity entity) {
|
|
+ return entity.position().equals(this.position)
|
|
+ && entity.getDeltaMovement().equals(this.momentum);
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index 124916e1ee9d32a530cbce90ed22fc1383cf49d1..df2deeeaf473f84268288be5eb60a9a7068a8d46 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -630,6 +630,25 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
return flags;
|
|
}
|
|
// Sakura end - load chunks on movement
|
|
+ // Sakura start - store entity data/state
|
|
+ private me.samsuik.sakura.entity.EntityState entityState = null;
|
|
+
|
|
+ public final Vec3 stuckSpeedMultiplier() {
|
|
+ return this.stuckSpeedMultiplier;
|
|
+ }
|
|
+
|
|
+ public final void storeEntityState() {
|
|
+ this.entityState = me.samsuik.sakura.entity.EntityState.of(this);
|
|
+ }
|
|
+
|
|
+ public final me.samsuik.sakura.entity.EntityState entityState() {
|
|
+ return this.entityState;
|
|
+ }
|
|
+
|
|
+ public final boolean compareState(Entity to) {
|
|
+ return to.entityState() != null && to.entityState().comparePositionAndMotion(this);
|
|
+ }
|
|
+ // Sakura end - store entity data/state
|
|
|
|
public Entity(EntityType<?> type, Level world) {
|
|
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
|
index 932e64a75d6a2d0e6c82fd8917d3faa054c2512f..49b01f78529f067eee65b14e7906b9f1de768f06 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
|
@@ -1499,6 +1499,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
|
|
|
public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
|
|
try {
|
|
+ entity.storeEntityState(); // Sakura - store entity data/state
|
|
tickConsumer.accept(entity);
|
|
} catch (Throwable throwable) {
|
|
if (throwable instanceof ThreadDeath) throw throwable; // Paper
|