upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fluids without sound event causing exception in tryFillContainer and tryEmptyContainer (#9445)

Browse Source
This commit is contained in:
DBotThePony authored and GitHub committed 2023-05-05 10:26:28 -07:00
1 parent ae05036bb3
commit 2c243626f6
1 file changed
+16 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/minecraftforge/fluids/FluidUtil.java
+16 -3
View File
@@ -138,7 +138,11 @@ public class FluidUtil
if (player != null)
{
SoundEvent soundevent = simulatedTransfer.getFluid().getFluidType().getSound(simulatedTransfer, SoundActions.BUCKET_FILL);
player.level.playSound(null, player.getX(), player.getY() + 0.5, player.getZ(), soundevent, SoundSource.BLOCKS, 1.0F, 1.0F);
if (soundevent != null)
{
player.level.playSound(null, player.getX(), player.getY() + 0.5, player.getZ(), soundevent, SoundSource.BLOCKS, 1.0F, 1.0F);
}
}
}
else
@@ -186,7 +190,11 @@ public class FluidUtil
if (doDrain && player != null)
{
SoundEvent soundevent = transfer.getFluid().getFluidType().getSound(transfer, SoundActions.BUCKET_EMPTY);
player.level.playSound(null, player.getX(), player.getY() + 0.5, player.getZ(), soundevent, SoundSource.BLOCKS, 1.0F, 1.0F);
if (soundevent != null)
{
player.level.playSound(null, player.getX(), player.getY() + 0.5, player.getZ(), soundevent, SoundSource.BLOCKS, 1.0F, 1.0F);
}
}
ItemStack resultContainer = containerFluidHandler.getContainer();
@@ -596,7 +604,12 @@ public class FluidUtil
if (!result.isEmpty())
{
SoundEvent soundevent = resource.getFluid().getFluidType().getSound(resource, SoundActions.BUCKET_EMPTY);
level.playSound(player, pos, soundevent, SoundSource.BLOCKS, 1.0F, 1.0F);
if (soundevent != null)
{
level.playSound(player, pos, soundevent, SoundSource.BLOCKS, 1.0F, 1.0F);
}
return true;
}
}