Skip to content

Commit a27e9f0

Browse files
committed
修复bug
1 parent 2027bd4 commit a27e9f0

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

src/main/java/github/kasuminova/novaeng/common/machine/MMAltar.kt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import crafttweaker.api.item.IIngredient
1616
import crafttweaker.api.item.IItemStack
1717
import crafttweaker.api.minecraft.CraftTweakerMC
1818
import crafttweaker.api.oredict.IOreDictEntry
19+
import github.kasuminova.mmce.common.concurrent.Sync
1920
import github.kasuminova.mmce.common.event.client.ControllerGUIRenderEvent
2021
import github.kasuminova.mmce.common.event.machine.MachineStructureUpdateEvent
2122
import github.kasuminova.mmce.common.event.machine.MachineTickEvent
@@ -33,7 +34,6 @@ import ink.ikx.mmce.common.utils.StackUtils
3334
import it.unimi.dsi.fastutil.objects.ObjectLists
3435
import kport.modularmagic.common.tile.TileLifeEssenceProvider
3536
import net.minecraft.block.Block
36-
import net.minecraft.block.state.IBlockState
3737
import net.minecraft.init.Blocks
3838
import net.minecraft.init.Items
3939
import net.minecraft.item.ItemStack
@@ -122,15 +122,19 @@ object MMAltar : MachineSpecial {
122122
val altar = ctrl.getAltar()
123123

124124
var sacrifice: Short = 0
125-
for (pos in ctrl.foundPattern.getPattern().keys) {
126-
val realPos: BlockPos = ctrl.getPos().add(pos.x, pos.y, pos.z)
127-
val state: IBlockState = ctrl.getWorld().getBlockState(realPos)
128-
if (state.block == RegistrarBloodMagicBlocks.BLOOD_RUNE) {
129-
if (state.block.getMetaFromState(state) == 3) ++sacrifice
125+
val mpos = BlockPos.MutableBlockPos()
126+
val ctrlPos = ctrl.getPos()
127+
Sync.addSyncTask {
128+
for (pos in ctrl.foundPattern.getPattern().keys) {
129+
mpos.setPos(ctrlPos.x + pos.x, ctrlPos.y + pos.y, ctrlPos.z + pos.z)
130+
val state = ctrl.getWorld().getBlockState(mpos)
131+
if (state.block == RegistrarBloodMagicBlocks.BLOOD_RUNE) {
132+
if (state.block.getMetaFromState(state) == 3) ++sacrifice
133+
}
130134
}
135+
nbt.setShort("sacrifice", sacrifice)
136+
finishCheck(altar, ctrl, nbt)
131137
}
132-
nbt.setShort("sacrifice", sacrifice)
133-
finishCheck(altar, ctrl, nbt)
134138
}
135139
machine.addMachineEventHandler(MachineTickEvent::class.java) {
136140
val ctrl = it.controller

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorPatternBus.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import javax.annotation.Nonnull
3838
class EFabricatorPatternBus : EFabricatorPart(), IAEAppEngInventory {
3939

4040
companion object {
41-
val PATTERN_SLOTS = 12 * 6
41+
const val PATTERN_SLOTS = 12 * 6
4242
}
4343

4444
val aePatterns = ObjectOpenHashSet<IAEItemStack>()
@@ -178,7 +178,7 @@ class EFabricatorPatternBus : EFabricatorPart(), IAEAppEngInventory {
178178

179179
override fun validate() {
180180
super.validate()
181-
if (FMLCommonHandler.instance().getEffectiveSide().isServer) {
181+
if (FMLCommonHandler.instance().effectiveSide.isServer) {
182182
ModularMachinery.EXECUTE_MANAGER.addSyncTask { this.refreshPatterns() }
183183
}
184184
}

0 commit comments

Comments
 (0)