diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java
index a54919c..dca945b 100644
--- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java
+++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/Terminator.java
@@ -112,6 +112,8 @@ public interface Terminator {
     void addVelocity(Vector velocity);
 
     int getAliveTicks();
+    
+    int getNoFallTicks();
 
     boolean tickDelay(int ticks);
 
diff --git a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyBlockCheck.java b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyBlockCheck.java
index 309cfdd..3fffacc 100644
--- a/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyBlockCheck.java
+++ b/TerminatorPlus-API/src/main/java/net/nuggetmc/tplus/api/agent/legacyagent/LegacyBlockCheck.java
@@ -145,7 +145,7 @@ public class LegacyBlockCheck {
     }
     
     public boolean tryPreMLG(Terminator bot, Location botLoc) {
-    	if(bot.isBotOnGround() || bot.getVelocity().getY() >= -0.8D)
+    	if(bot.isBotOnGround() || bot.getVelocity().getY() >= -0.8D || bot.getNoFallTicks() > 7)
     		return false;
     	if (tryPreMLG(bot, botLoc, 3))
     		return true;
diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java
index 69b3d77..b2f2751 100644
--- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java
+++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/bot/Bot.java
@@ -254,6 +254,11 @@ public class Bot extends ServerPlayer implements Terminator {
     public int getAliveTicks() {
         return aliveTicks;
     }
+    
+    @Override
+    public int getNoFallTicks() {
+    	return noFallTicks;
+    }
 
     @Override
     public boolean tickDelay(int i) {
diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java
index 8b61ceb..9010d79 100644
--- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java
+++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java
@@ -315,8 +315,19 @@ public class BotCommand extends CommandInstance {
             	sender.sendMessage("The spawn location has been reset to the player location.");
             	return;
             }
+            if (arg2.equalsIgnoreCase("playerloc")) {
+            	if (!(sender instanceof Player)) {
+            		sender.sendMessage("You must be a player to do this!");
+                	return;
+            	}
+            	Location loc = ((Player)sender).getLocation();
+            	manager.setSpawnLoc(loc.clone());
+            	sender.sendMessage("The spawn location has been set to " + ChatColor.BLUE + formatter.format(loc.getX()) + ", " + formatter.format(loc.getY()) + ", " + formatter.format(loc.getZ()) + ChatColor.RESET + ".");
+            	return;
+            }
             if (args.size() != 4) {
             	sender.sendMessage("Incorrect argument size. Correct syntax: " + ChatColor.YELLOW + "/bot settings spawnloc <x> <y> <z>" + ChatColor.RESET);
+            	sender.sendMessage("Additionally, to specify a spawnloc at the current player position: " + ChatColor.YELLOW + "/bot settings spawnloc playerloc" + ChatColor.RESET);
             	return;
             }
             double x, y, z;