From 9e75c3691410dda1cc0580f9c929378c013534e4 Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:13:42 +0200 Subject: [PATCH] 1.21.2-pre3 --- gradle.properties | 2 +- src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java | 3 ++- src/main/java/carpet/script/api/WorldAccess.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 584903a3b1..32c2388250 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check https://fabricmc.net/develop/ - minecraft_version=1.21.2-pre1 + minecraft_version=1.21.2-pre3 loader_version=0.16.5 jsr305_version=3.0.2 fabric_version=0.105.1+1.21.2 diff --git a/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java b/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java index 9ea443017d..77a099a1c3 100644 --- a/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java +++ b/src/main/java/carpet/mixins/LevelChunk_movableBEMixin.java @@ -72,6 +72,7 @@ private BlockEntity ifGetBlockEntity(LevelChunk worldChunk, BlockPos blockPos_1, */ /* @Nullable */ // todo update me to the new version + @Override public BlockState setBlockStateWithBlockEntity(BlockPos blockPos_1, BlockState newBlockState, BlockEntity newBlockEntity, boolean boolean_1) { @@ -154,7 +155,7 @@ else if (oldBlock != newBlock && oldBlock instanceof EntityBlock) newBlockState.onPlace(this.level, blockPos_1, oldBlockState, boolean_1); //This can call setblockstate! (e.g. hopper does) } - this.unsaved = true; // shouldSave + markUnsaved(); return oldBlockState; } } diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index 54aa7adc6f..1e9aa470a9 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/src/main/java/carpet/script/api/WorldAccess.java @@ -1363,7 +1363,7 @@ LivingEntity getIndirectSourceEntity() { WorldTools.forceChunkUpdate(pos, world); } - chunk.setUnsaved(true); + chunk.markUnsaved(); return Value.TRUE; });