Skip to content

Commit 2b28cc3

Browse files
committed
Merge remote-tracking branch 'SquidDev-CC-ComputerCraft/hotfix/disk-drive-stop'
2 parents d28694e + f976138 commit 2b28cc3

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDrivePeripheral.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ public Object[] callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaCont
6262
{
6363
case 0:
6464
{
65-
// isPresent
65+
// isDiskPresent
6666
return new Object[] {
67-
m_diskDrive.getDiskStack() != null
67+
!m_diskDrive.getDiskStack().isEmpty()
6868
};
6969
}
7070
case 1:

src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ public IPeripheral getPeripheral( EnumFacing side )
422422
return new DiskDrivePeripheral( this );
423423
}
424424

425+
@Nonnull
425426
public ItemStack getDiskStack()
426427
{
427428
synchronized( this )

src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ public void playRecord( SoundEvent record, String recordInfo, World world, Block
154154
packet.m_dataInt = new int[] { pos.getX(), pos.getY(), pos.getZ() };
155155
}
156156

157-
ComputerCraft.sendToAllPlayers( packet );
157+
NetworkRegistry.TargetPoint point = new NetworkRegistry.TargetPoint( world.provider.getDimension(), pos.getX(), pos.getY(), pos.getZ(), 64 );
158+
ComputerCraft.sendToAllAround( packet, point );
158159
}
159160

160161
@Override

0 commit comments

Comments
 (0)