mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-10-20 14:16:26 -04:00
Merge branch 'feature/more-bugs-fixed' into 'main'
more smaller bugs fixed (neoforge users rejoice) Closes #1068, #1072, and #1073 See merge request cable-mc/cobblemon!1192
This commit is contained in:
@@ -208,7 +208,9 @@ class GildedChestBlock(settings: Properties, val type: Type = Type.RED) : BaseEn
|
||||
newState: BlockState,
|
||||
moved: Boolean
|
||||
) {
|
||||
Containers.dropContentsOnDestroy(state, newState, world, pos)
|
||||
if (!isFake()) {
|
||||
Containers.dropContentsOnDestroy(state, newState, world, pos)
|
||||
}
|
||||
super.onRemove(state, world, pos, newState, moved)
|
||||
}
|
||||
|
||||
|
||||
+1
-3
@@ -29,9 +29,7 @@ import net.minecraft.client.multiplayer.ClientLevel
|
||||
import net.minecraft.client.resources.sounds.SimpleSoundInstance
|
||||
import net.minecraft.resources.ResourceLocation
|
||||
import net.minecraft.sounds.SoundEvent
|
||||
import net.minecraft.sounds.SoundSource
|
||||
import net.minecraft.world.entity.Entity
|
||||
import net.minecraft.world.level.block.SoundType
|
||||
import net.minecraft.world.phys.Vec3
|
||||
import java.util.*
|
||||
|
||||
@@ -104,7 +102,7 @@ class BedrockSoundKeyframe(
|
||||
val soundEvent = SoundEvent.createVariableRangeEvent(sound) // Means we don't need to setup a sound registry entry for every single thing
|
||||
if (soundEvent != null) {
|
||||
if (entity != null) {
|
||||
entity.playSound(soundEvent, 1F, 1F)
|
||||
entity.level().playLocalSound(entity, soundEvent, entity.soundSource, 1F, 1F)
|
||||
} else {
|
||||
Minecraft.getInstance().soundManager.play(SimpleSoundInstance.forUI(soundEvent, 1F))
|
||||
}
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
/**
|
||||
* See [UnsplittablePacket] for why this is necessary
|
||||
* See {@link UnsplittablePacket} for why this is necessary
|
||||
* I am concerned about how mappings will work with this, as the CustomPayloadS2CPacket stuff needs to be remapped
|
||||
* NeoForge stuff doesnt...
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user