mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-31 13:42:59 +00:00
Code Issues Releases Wiki Activity

Some sanity checks for get{Direction,Orientation}

Browse Source 
Silly bodge, but should fix #600.
This commit is contained in:
SquidDev
2020-12-10 19:13:49 +00:00
committed by Jummit
parent 02c7903cb7
commit d6c5a5bd27
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
patchwork.md
View File

@@ -435,3 +435,10 @@ ea3a16036794357c3a44edffc90fdb652e03881e
Remove a couple of todos
```
```
bb8f4c624bf87169b73fb631d8250cfc38181e15
Some sanity checks for get{Direction,Orientation}
```
Use `getCachedState` instead of forge's `getBlockState` and `contains` instead of `has`.

5
src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
View File

@@ -218,7 +218,10 @@ public class TileMonitor extends TileGeneric implements IPeripheralTile {
// region Sizing and placement stuff
public Direction getDirection() {
return this.getCachedState().get(BlockMonitor.FACING);
// Ensure we're actually a monitor block. This _should_ always be the case, but sometimes there's
// fun problems with the block being missing on the client.
BlockState state = getCachedState();
return state.contains( BlockMonitor.FACING ) ? state.get( BlockMonitor.FACING ) : Direction.NORTH;
}
public Direction getOrientation() {