mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-28 01:44:48 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'SquidDev-CC-ComputerCraft/hotfix/disk-drive-stop'

Browse Source
This commit is contained in:
SquidDev 2018-03-29 11:41:00 +01:00
commit 2b28cc3558
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDrivePeripheral.java
View File

@ -62,9 +62,9 @@ public class DiskDrivePeripheral implements IPeripheral
{ {
case 0: case 0:
{ {
// isPresent // isDiskPresent
return new Object[] { return new Object[] {
m_diskDrive.getDiskStack() != null !m_diskDrive.getDiskStack().isEmpty()
}; };
} }
case 1: case 1:

1
src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java
View File

@ -422,6 +422,7 @@ public class TileDiskDrive extends TilePeripheralBase
return new DiskDrivePeripheral( this ); return new DiskDrivePeripheral( this );
} }
@Nonnull
public ItemStack getDiskStack() public ItemStack getDiskStack()
{ {
synchronized( this ) synchronized( this )

3
src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java
View File

@ -154,7 +154,8 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
packet.m_dataInt = new int[] { pos.getX(), pos.getY(), pos.getZ() }; packet.m_dataInt = new int[] { pos.getX(), pos.getY(), pos.getZ() };
} }
ComputerCraft.sendToAllPlayers( packet ); NetworkRegistry.TargetPoint point = new NetworkRegistry.TargetPoint( world.provider.getDimension(), pos.getX(), pos.getY(), pos.getZ(), 64 );
ComputerCraft.sendToAllAround( packet, point );
} }
@Override @Override