X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fobjects%2FBlock.java;h=0800b5b5cb8d8f713aef6e017a4c7af355675c79;hp=b6628cb20a1f283ab17f63a61e833a79461e9032;hb=f4d52e3e4a3712050532786fca0aded5ff8b5a03;hpb=aa867d19dc70babe1e3c091c60f903b06eb65fcf diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java index b6628cb..0800b5b 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java +++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java @@ -14,6 +14,7 @@ public class Block { private final int hp; private final String drop; private final String meta; + @CheckForNull private final Sprite tex; private final boolean coll; @@ -85,11 +86,12 @@ public class Block { return !drop.equals("none"); } - public Sprite getTex() { + public Sprite getTexture() { + assert tex != null; return tex; } - public Rectangle getRect(int x, int y) { + public Rectangle getRectangle(int x, int y) { x *= 16; y *= 16; return new Rectangle(x + this.x, y + this.y, w, h);