delete unnecessary checks in internalrobot

Author: compiler64

engine/src/main/battlecode/world/GameWorld.java

@@ -1076,34 +1076,43 @@ public void destroyRobot(int id, boolean fromException, boolean fromDamage) {
             } else if (robot.getType().isCatType()) {
                 this.numCats -= 1;
             }
+
             for (MapLocation robotLoc : robot.getAllPartLocations()) {
                 removeRobot(robotLoc);
             }
+
             if (robot.isCarryingRobot()) {
                 InternalRobot carryingRobot = robot.getRobotBeingCarried();
                 carryingRobot.getDropped(loc);
             }
+
             if (robot.isGrabbedByRobot()) {
                 InternalRobot carrier = robot.getGrabbedByRobot();
                 robot.clearGrabbedByRobot();
+
                 if (carrier != null && carrier.getRobotBeingCarried() == robot) {
                     carrier.clearCarryingRobot();
                 }
             }
+
             if (robot.getCheese() > 0) {
                 addCheese(loc, robot.getCheese());
                 matchMaker.addCheeseSpawnAction(loc, robot.getCheese());
             }
         }
+
         controlProvider.robotKilled(robot);
         objectInfo.destroyRobot(id);
-        if (fromDamage || fromException)
+
+        if (fromDamage || fromException) {
             matchMaker.addDieAction(id, fromException);
-        else
+        } else {
             matchMaker.addDied(id);
+        }
 
-        if (robot.getType() != UnitType.CAT)
+        if (robot.getType() != UnitType.CAT) {
             this.currentNumberUnits[robot.getTeam().ordinal()] -= 1;
+        }
 
         // check win
         if (robot.getType() == UnitType.RAT_KING && this.getTeamInfo().getNumRatKings(robot.getTeam()) == 0) {
@@ -1121,6 +1130,7 @@ public void setProfilerCollection(Team team, ProfilerCollection profilerCollecti
         if (profilerCollections == null) {
             profilerCollections = new HashMap<>();
         }
+        
         profilerCollections.put(team, profilerCollection);
     }
 }

engine/src/main/battlecode/world/InternalRobot.java

@@ -2,7 +2,6 @@
 
 import java.util.*;
 
-import battlecode.world.CatStateType;
 import battlecode.common.Direction;
 import battlecode.common.GameActionException;
 import battlecode.common.GameConstants;
@@ -616,7 +615,6 @@ public void scratch(MapLocation loc) {
     }
 
     public void grabRobot(MapLocation loc) {
-
         this.robotBeingCarried = this.gameWorld.getRobot(loc);
         this.robotBeingCarried.getGrabbed(this); // Notify the grabbed robot that it has been picked up
         this.gameWorld.getMatchMaker().addRatNapAction(this.getID());
@@ -627,21 +625,7 @@ public void grabRobot(MapLocation loc) {
     }
 
     public void dropRobot(Direction dir) {
-        if (!this.type.isThrowingType()) {
-            throw new RuntimeException("Unit must be a rat to drop other rats");
-        } else if (!this.isCarryingRobot()) {
-            throw new RuntimeException("Not carrying a robot to drop");
-        }
         MapLocation dropLoc = this.getLocation().add(dir);
-        if (!this.gameWorld.getGameMap().onTheMap(dropLoc)) {
-            throw new RuntimeException("Cannot drop outside of map");
-        } else if (this.gameWorld.getRobot(dropLoc) != null) {
-            throw new RuntimeException("Cannot drop into occupied space");
-        } else if (!this.gameWorld.isPassable(dropLoc)) {
-            throw new RuntimeException("Cannot drop into impassable terrain");
-        }
-
-        // Drop the robot
         this.robotBeingCarried.getDropped(dropLoc);
         this.robotBeingCarried = null;
     }
@@ -676,10 +660,12 @@ private void swapGrabber() {
     private void getGrabbed(InternalRobot grabber) {
         this.grabbedByRobot = grabber;
         this.gameWorld.removeRobot(getLocation());
+
         if (this.isCarryingRobot()) { // If we were carrying a robot, drop it
             this.robotBeingCarried.getDropped(getLocation());
             this.robotBeingCarried = null;
         }
+        
         this.setInternalLocationOnly(grabber.getLocation());
 
         if (grabber.getTeam() != this.getTeam()) {
@@ -689,19 +675,6 @@ private void getGrabbed(InternalRobot grabber) {
     }
 
     public void throwRobot() {
-        if (!this.type.isThrowingType()) {
-            throw new RuntimeException("Unit must be a rat to throw other rats");
-        } else if (!this.isCarryingRobot()) {
-            throw new RuntimeException("Not carrying a robot to throw");
-        }
-        if (!this.gameWorld.getGameMap().onTheMap(this.getLocation().add(this.dir))) {
-            throw new RuntimeException("Cannot throw outside of map");
-        } else if (this.gameWorld.getRobot(this.getLocation().add(this.dir)) != null
-                && this.gameWorld.getRobot(this.getLocation().add(this.dir)).getType() != UnitType.CAT) {
-            throw new RuntimeException("Cannot throw into a space occupied by another rat");
-        }
-
-        // Throw the robot
         this.robotBeingCarried.getThrown(this.dir);
         this.gameWorld.getMatchMaker().addThrowAction(this.robotBeingCarried.getID(),
                 this.getLocation().add(this.dir));
@@ -737,6 +710,7 @@ public void getDropped(MapLocation loc) {
         } else if (!this.gameWorld.isPassable(loc)) {
             throw new RuntimeException("Cannot drop into impassable terrain");
         }
+
         this.grabbedByRobot = null;
         this.remainingCarriedDuration = 0;
         this.setInternalLocationOnly(loc);

engine/src/main/battlecode/world/RobotControllerImpl.java

@@ -1228,6 +1228,7 @@ public void transferCheese(MapLocation loc, int amount) throws GameActionExcepti
     public void assertCanThrowRat(Direction dir) throws GameActionException {
         assertIsActionReady();
         MapLocation nextLoc = this.getLocation().add(dir);
+
         if (!this.robot.getType().isBabyRatType()) {
             throw new GameActionException(CANT_DO_THAT, "Only rats can throw other rats!");
         }
@@ -1244,6 +1245,7 @@ public void assertCanThrowRat(Direction dir) throws GameActionException {
     public void assertCanDropRat(Direction dir) throws GameActionException {
         assertIsActionReady();
         MapLocation nextLoc = this.getLocation().add(dir);
+        
         if (!this.robot.getType().isBabyRatType()) {
             throw new GameActionException(CANT_DO_THAT, "Only rats can drop other rats!");
         }