upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 06:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/louis' into dev

Browse Source
This commit is contained in:
Luis C.M committed 2022-11-06 01:27:45 -06:00
2 parents 8d3cd3fd82 5cb5770a20
commit 0291fd44a5
2 files changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/scripted/NpcAPI.java
+5 -3
View File
@@ -209,15 +209,17 @@ public class NpcAPI extends AbstractNpcAPI {
}
public ITileEntity getITileEntity(IWorld world, IPos pos) {
return new ScriptTileEntity<>(world.getMCWorld().getTileEntity(pos.getX(), pos.getY(),pos.getZ()));
TileEntity tileEntity = world.getMCWorld().getTileEntity(pos.getX(), pos.getY(),pos.getZ());
return this.getITileEntity(tileEntity);
}
public ITileEntity getITileEntity(IWorld world, int x, int y, int z) {
return new ScriptTileEntity<>(world.getMCWorld().getTileEntity(x,y,z));
TileEntity tileEntity = world.getMCWorld().getTileEntity(x,y,z);
return this.getITileEntity(tileEntity);
}
public ITileEntity getITileEntity(TileEntity tileEntity) {
return new ScriptTileEntity<>(tileEntity);
return tileEntity == null ? null : new ScriptTileEntity<>(tileEntity);
}
public IPos getIPos(BlockPos pos) {