Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed monitor still usable with an invalid video channel

Browse source
This commit is contained in:
Unknown 2018-05-13 11:04:25 +02:00
parent 165825a444
commit aba9ed1c6d
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/cr0s/warpdrive/block/detection/BlockMonitor.java
View file

@ -2,6 +2,7 @@ package cr0s.warpdrive.block.detection;
import cr0s.warpdrive.Commons; import cr0s.warpdrive.Commons;
import cr0s.warpdrive.WarpDrive; import cr0s.warpdrive.WarpDrive;
import cr0s.warpdrive.api.IVideoChannel;
import cr0s.warpdrive.block.BlockAbstractContainer; import cr0s.warpdrive.block.BlockAbstractContainer;
import cr0s.warpdrive.data.CameraRegistryItem; import cr0s.warpdrive.data.CameraRegistryItem;
import cr0s.warpdrive.render.ClientCameraHandler; import cr0s.warpdrive.render.ClientCameraHandler;
@ -69,7 +70,13 @@ public class BlockMonitor extends BlockAbstractContainer {
final TileEntity tileEntity = world.getTileEntity(x, y, z); final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (tileEntity instanceof TileEntityMonitor) { if (tileEntity instanceof TileEntityMonitor) {
// validate video channel
final int videoChannel = ((TileEntityMonitor) tileEntity).getVideoChannel(); final int videoChannel = ((TileEntityMonitor) tileEntity).getVideoChannel();
if ( videoChannel < IVideoChannel.VIDEO_CHANNEL_MIN
|| videoChannel > IVideoChannel.VIDEO_CHANNEL_MAX ) {
Commons.addChatMessage(entityPlayer, ((TileEntityMonitor) tileEntity).getStatus());
return true;
}
// validate camera // validate camera
final CameraRegistryItem camera = WarpDrive.cameras.getCameraByVideoChannel(world, videoChannel); final CameraRegistryItem camera = WarpDrive.cameras.getCameraByVideoChannel(world, videoChannel);