diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
index cece8e2c625ebe9e8823f9a5b347f063e5485e4b..406ee346b461859f3d436d82ab8f155cf286c8ee 100644 (file)
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
+import org.jetbrains.annotations.Nullable;
import ru.deadsoftware.cavedroid.MainConfig;
import ru.deadsoftware.cavedroid.game.mobs.Mob;
import ru.deadsoftware.cavedroid.game.mobs.MobsController;
import ru.deadsoftware.cavedroid.MainConfig;
import ru.deadsoftware.cavedroid.game.mobs.Mob;
import ru.deadsoftware.cavedroid.game.mobs.MobsController;
import ru.deadsoftware.cavedroid.game.objects.drop.DropController;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import ru.deadsoftware.cavedroid.game.objects.drop.DropController;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
-import javax.annotation.CheckForNull;
import javax.inject.Inject;
import java.util.Iterator;
import javax.inject.Inject;
import java.util.Iterator;
/**
* @return colliding rect or null if no collision
*/
/**
* @return colliding rect or null if no collision
*/
- @CheckForNull
+ @Nullable
private Rectangle checkColl(Rectangle rect) {
int minX = (int) ((rect.x + rect.width / 2) / 16) - 4;
int minY = (int) ((rect.y + rect.height / 2) / 16) - 4;
private Rectangle checkColl(Rectangle rect) {
int minX = (int) ((rect.x + rect.width / 2) / 16) - 4;
int minY = (int) ((rect.y + rect.height / 2) / 16) - 4;
/**
* @return Rectangle representing magneting target for this drop
*/
/**
* @return Rectangle representing magneting target for this drop
*/
- @CheckForNull
+ @Nullable
private Rectangle getShiftedMagnetingPlayerRect(Drop drop) {
final Player player = mMobsController.getPlayer();
private Rectangle getShiftedMagnetingPlayerRect(Drop drop) {
final Player player = mMobsController.getPlayer();
return;
}
return;
}
- @CheckForNull Rectangle collidingRect = checkColl(mob);
+ @Nullable Rectangle collidingRect = checkColl(mob);
if (collidingRect != null) {
if (mob.canJump() && !mob.isFlyMode() && collidingRect.y >= mob.y + mob.height - 8) {
if (collidingRect != null) {
if (mob.canJump() && !mob.isFlyMode() && collidingRect.y >= mob.y + mob.height - 8) {
}
private void mobYColl(Mob mob) {
}
private void mobYColl(Mob mob) {
- @CheckForNull final Rectangle collidingRect = checkColl(mob);
+ @Nullable final Rectangle collidingRect = checkColl(mob);
if (collidingRect != null) {
int d = -1;
if (collidingRect != null) {
int d = -1;