Skip to content

Commit 794c0f2

Browse files
committed
Fixes #170
1 parent d5e1685 commit 794c0f2

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

src/main/java/net/licks92/WirelessRedstone/Listeners/BlockListener.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void onSignChange(final SignChangeEvent event) {
3434
return;
3535
}
3636

37-
if (event.getLine(1).equalsIgnoreCase("")){
37+
if (event.getLine(1).equalsIgnoreCase("")) {
3838
event.getBlock().setType(Material.AIR);
3939
event.getBlock().getWorld().dropItem(event.getBlock().getLocation(), new ItemStack(Material.SIGN));
4040
Utils.sendFeedback("No channelname given!", event.getPlayer(), true); //TODO: Add string to stringloader
@@ -280,7 +280,7 @@ public void onBlockRedstoneChange(BlockRedstoneEvent event) {
280280
if (event.getOldCurrent() == event.getNewCurrent())
281281
return;
282282

283-
if(event.getBlock().getState() instanceof Sign){
283+
if (event.getBlock().getState() instanceof Sign) {
284284
Sign signObject = (Sign) event.getBlock().getState();
285285

286286
if (Main.getSignManager().getSignType(signObject.getLine(0)) != SignType.TRANSMITTER)
@@ -310,7 +310,7 @@ public void onBlockRedstoneChange(BlockRedstoneEvent event) {
310310
}
311311

312312
BlockRedstoneEvent e = null;
313-
switch (event.getBlock().getType()){
313+
switch (event.getBlock().getType()) {
314314
case LEVER:
315315
case STONE_BUTTON:
316316
case WOOD_BUTTON:
@@ -334,7 +334,7 @@ public void onBlockRedstoneChange(BlockRedstoneEvent event) {
334334
break;
335335
}
336336

337-
for (BlockFace blockFace : Utils.getEveryBlockFace(true)){
337+
for (BlockFace blockFace : Utils.getEveryBlockFace(true)) {
338338
if (event.getBlock().getRelative(blockFace).getState() instanceof Sign) {
339339
Sign signObject = (Sign) event.getBlock().getRelative(blockFace).getState();
340340

src/main/java/net/licks92/WirelessRedstone/Storage/SQLiteStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ public boolean convertFromAnotherStorage(StorageType type) {
430430

431431
@Override
432432
public boolean isChannelEmpty(WirelessChannel channel) {
433-
return (channel.getReceivers().size() < 1) && (channel.getTransmitters().size() < 1) && (channel.getScreens().size() < 1);
433+
return channel == null || (channel.getReceivers().size() < 1) && (channel.getTransmitters().size() < 1) && (channel.getScreens().size() < 1);
434434
}
435435

436436
@Override

src/main/java/net/licks92/WirelessRedstone/Storage/YamlStorage.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,7 @@ public boolean convertFromAnotherStorage(StorageType type) { //TODO: Finish this
364364

365365
@Override
366366
public boolean isChannelEmpty(WirelessChannel channel) {
367-
return (channel.getReceivers().size() < 1)
368-
&& (channel.getTransmitters().size() < 1)
369-
&& (channel.getScreens().size() < 1);
367+
return channel == null || (channel.getReceivers().size() < 1) && (channel.getTransmitters().size() < 1) && (channel.getScreens().size() < 1);
370368
}
371369

372370
@Override

0 commit comments

Comments
 (0)