PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-17 10:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Destruction states will now reset when breaking/replacing the block

Browse source
This commit is contained in:
Sollace 2021-01-27 20:07:16 +02:00
parent 24cd6a9a3b
commit 543fd7aee0
3 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/minelittlepony/unicopia/BlockDestructionManager.java
View file

@ -5,6 +5,7 @@ import com.minelittlepony.unicopia.network.MsgBlockDestruction;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import net.minecraft.block.BlockState;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@ -49,6 +50,12 @@ public class BlockDestructionManager {
return amount;
}
public void onBlockChanged(BlockPos pos, BlockState oldState, BlockState newstate) {
if (oldState.getBlock() != newstate.getBlock()) {
clearBlockDestruction(pos);
}
}
public void tick() {
synchronized (locker) {
destructions.long2ObjectEntrySet().removeIf(entry -> entry.getValue().tick());

23
src/main/java/com/minelittlepony/unicopia/mixin/MixinServerWorld.java Normal file
View file

@ -0,0 +1,23 @@
package com.minelittlepony.unicopia.mixin;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.minelittlepony.unicopia.BlockDestructionManager;
import net.minecraft.block.BlockState;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.StructureWorldAccess;
import net.minecraft.world.World;
@Mixin(ServerWorld.class)
abstract class MixinServerWorld extends World implements StructureWorldAccess {
private MixinServerWorld() {super(null, null, null, null, false, false, 0);}
@Inject(method = "onBlockChanged", at = @At("HEAD"))
private void onOnBlockChanged(BlockPos pos, BlockState oldState, BlockState newState, CallbackInfo info) {
((BlockDestructionManager.Source)this).getDestructionManager().onBlockChanged(pos, oldState, newState);
}
}

1
src/main/resources/unicopia.mixin.json
View file

@ -16,6 +16,7 @@
"MixinPlayerEntity",
"MixinProjectileEntity",
"MixinServerPlayerEntity",
"MixinServerWorld",
"MixinSheepEntity",
"MixinShulkerEntity",
"MixinTargetPredicate",