diff --git a/index.php b/index.php
index b37380e4a..e9ff64803 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-$current_revision = "27 November 2018";
+$current_revision = "2 January 2019";
 
 require_once("config.php");
 require_once("lib/logging.php");
diff --git a/lib/npc.php b/lib/npc.php
index 7582a8840..c5eee8f95 100644
--- a/lib/npc.php
+++ b/lib/npc.php
@@ -1,6 +1,6 @@
 <?php
-
 $factions = faction_list();
+
 $faction_values = array(
  -1 => "Aggressive",
   0 => "Passive",
@@ -112,6 +112,13 @@
 
 $special_abilities_max = count($specialattacks);
 
+$stuck = array(
+  0 => 'Run to Target',
+  1 => 'Warp to Target',
+  2 => 'Take No Action',
+  3 => 'Evade Combat'
+);
+
 switch ($action) {
   case 0:
     if ($npcid) {  // View NPC
@@ -167,6 +174,7 @@
     $body->set('faction_values', $faction_values);
     $body->set('pet', get_ispet());
     $body->set('special_abilities_max', $special_abilities_max);
+    $body->set('stuck', $stuck);
     $vars = npc_info();
     if ($vars) {
       foreach ($vars as $key=>$value) {
@@ -365,6 +373,7 @@
     $body->set('classes', $classes);
     $body->set('specialattacks', $specialattacks);
     $body->set('special_abilities_max', $special_abilities_max);
+    $body->set('stuck', $stuck);
     $vars = get_stats();
     if ($vars) {
       foreach ($vars as $key=>$value) {
@@ -1374,6 +1383,7 @@ function update_npc() {
   if ($charm_avoidance_rating != $_POST['charm_avoidance_rating']) $fields .= "charm_avoidance_rating=\"" . $_POST['charm_avoidance_rating'] . "\", ";
   if ($skip_global_loot != $_POST['skip_global_loot']) $fields .= "skip_global_loot=\"" . $_POST['skip_global_loot'] . "\", ";
   if ($rare_spawn != $_POST['rare_spawn']) $fields .= "rare_spawn=\"" . $_POST['rare_spawn'] . "\", ";
+  if ($stuck_behavior != $_POST['stuck_behavior']) $fields .= "stuck_behavior=\"" . $_POST['stuck_behavior'] . "\", ";
 
   $fields =  rtrim($fields, ", ");
 
@@ -1524,7 +1534,8 @@ function add_npc() {
   $fields .= "charm_accuracy_rating=\"" . $_POST['charm_accuracy_rating'] . "\", ";
   $fields .= "charm_avoidance_rating=\"" . $_POST['charm_avoidance_rating'] . "\", ";
   $fields .= "skip_global_loot=\"" . $_POST['skip_global_loot'] . "\", ";
-  $fields .= "rare_spawn=\"" .$_POST['rare_spawn'] . "\"";
+  $fields .= "rare_spawn=\"" .$_POST['rare_spawn'] . "\", ";
+  $fields .= "stuck_behavior=\"" .$_POST['stuck_behavior'] . "\"";
 
   if ($fields != '') {
     $query = "INSERT INTO npc_types SET $fields";
@@ -1654,7 +1665,8 @@ function copy_npc() {
   $fields .= "charm_accuracy_rating=\"" . $_POST['charm_accuracy_rating'] . "\", ";
   $fields .= "charm_avoidance_rating=\"" . $_POST['charm_avoidance_rating'] . "\", ";
   $fields .= "skip_global_loot=\"" . $_POST['skip_global_loot'] . "\", ";
-  $fields .= "rare_spawn=\"" . $_POST['rare_spawn'] . "\"";
+  $fields .= "rare_spawn=\"" . $_POST['rare_spawn'] . "\", ";
+  $fields .= "stuck_behavior=\"" . $_POST['stuck_behavior'] . "\"";
 
   if ($fields != '') {
     $query = "INSERT INTO npc_types SET $fields";
diff --git a/templates/npc/js.tmpl.php b/templates/npc/js.tmpl.php
index c996db6a2..07efd59f1 100644
--- a/templates/npc/js.tmpl.php
+++ b/templates/npc/js.tmpl.php
@@ -7,4 +7,13 @@ function sanityCheck() {
       alert("Warning: You made this NPC both tethered AND leashed!");
     }
   }
+
+  function underwaterCheck() {
+    var underwater = document.forms[1].underwater.checked;
+    var stuck = document.forms[1].stuck_behavior.value;
+
+    if (underwater && stuck != 2) {
+      alert("NPC is marked as an Underwater NPC. It is recommended to set Stuck Behavior to 'Take No Action'.");
+    }
+  }
 </script>
\ No newline at end of file
diff --git a/templates/npc/npc.add.tmpl.php b/templates/npc/npc.add.tmpl.php
index 654b2c263..14d2ab7a8 100644
--- a/templates/npc/npc.add.tmpl.php
+++ b/templates/npc/npc.add.tmpl.php
@@ -300,7 +300,14 @@
               <td align="left" width="17%">Emote:           <br><input type="text" name="emoteid" size="10" value="0"></td>
               <td align="left" width="17%">No Target Hotkey:<br><input type="text" name="no_target_hotkey" size="10" value="0"></td>
               <td align="left" width="16%">Raid Target:     <br><input type="text" name="raid_target" size="5" value="0"></td>
-              <td align="left" width="16%">&nbsp;</td>
+              <td align="left" width="16%">
+                Stuck Behavior:<br>
+                <select name="stuck_behavior" onChange="underwaterCheck();">
+<?foreach ($stuck as $key=>$value):?>
+                  <option value="<?=$key?>"><?=$key?>: <?=$value?></option>
+<?endforeach;?>
+                </select>
+              </td>
             </tr>
           </table><br>
           <center>
@@ -317,7 +324,7 @@
                   <input type="checkbox" name="unique_spawn_by_name" value="1"> Unique by Name<br>
                 </td>
                 <td valign="top" align="left">
-                  <input type="checkbox" name="underwater" value="1"> Underwater NPC<br>
+                  <input type="checkbox" name="underwater" value="1" onChange="underwaterCheck();"> Underwater NPC<br>
                   <input type="checkbox" name="34" value="34,1"> Destructible Object (34)<br>
                   <input type="checkbox" name="isquest" value="1"> Has Quest File<br>
                 </td>
diff --git a/templates/npc/npc.edit.tmpl.php b/templates/npc/npc.edit.tmpl.php
index bde52b903..9a78406e0 100644
--- a/templates/npc/npc.edit.tmpl.php
+++ b/templates/npc/npc.edit.tmpl.php
@@ -310,7 +310,14 @@
               <td align="left" width="17%">Emote:           <br><input type="text" name="emoteid" size="10" value="<?=$emoteid?>"></td>
               <td align="left" width="17%">No Target Hotkey:<br><input type="text" name="no_target_hotkey" size="10" value="<?=$no_target_hotkey?>"></td>
               <td align="left" width="16%">Raid Target:     <br><input type="text" name="raid_target" size="5" value="<?=$raid_target?>"></td>
-              <td align="left" width="16%">&nbsp;</td>
+              <td align="left" width="16%">
+                Stuck Behavior:<br>
+                <select name="stuck_behavior" onChange="underwaterCheck();">
+<?foreach ($stuck as $key=>$value):?>
+                  <option value="<?=$key?>"<?echo ($stuck_behavior == $key) ? " selected" : "";?>><?=$key?>: <?=$value?></option>
+<?endforeach;?>
+                </select>
+              </td>
             </tr>
           </table><br>
           <center>
@@ -327,7 +334,7 @@
                   <input type="checkbox" name="unique_spawn_by_name" value="1"<?echo ($unique_spawn_by_name == 1) ? " checked" : "";?>> Unique by Name<br>
                 </td>
                 <td valign="top" align="left">
-                  <input type="checkbox" name="underwater" value="1"<?echo ($underwater == 1) ? " checked" : "";?>> Underwater NPC<br>
+                  <input type="checkbox" name="underwater" value="1"<?echo ($underwater == 1) ? " checked" : "";?> onChange="underwaterCheck();"> Underwater NPC<br>
                   <input type="checkbox" name="34" value="34,1^"<?echo ($specabil[34] == 1) ? "checked" : "";?>>  Destructible Object (34)<br>
                   <input type="checkbox" name="isquest" value="1"<?echo ($isquest == 1) ? " checked" : "";?>> Has Quest File<br>
                 </td>
diff --git a/templates/npc/npc.tmpl.php b/templates/npc/npc.tmpl.php
index 5d0fd10a2..5939f3929 100644
--- a/templates/npc/npc.tmpl.php
+++ b/templates/npc/npc.tmpl.php
@@ -325,7 +325,7 @@
                   <tr>
                     <td align="left" width="33%">Skip Global Loot: <?=$yesno[$skip_global_loot]?></td>
                     <td align="left" width="33%">Rare Spawn: <?=$yesno[$rare_spawn]?></td>
-                    <td align="left" width="34%">&nbsp;</td>
+                    <td align="left" width="34%">Stuck Behavior: <?=$stuck_behavior?></td>
                   </tr>
                 </table>
               </fieldset>
@@ -435,6 +435,7 @@
         <input type="hidden" name="charm_avoidance_rating" value="<?=$charm_avoidance_rating?>">
         <input type="hidden" name="skip_global_loot" value="<?=$skip_global_loot?>">
         <input type="hidden" name="rare_spawn" value="<?=$rare_spawn?>">
+        <input type="hidden" name="stuck_behavior" value="<?=$stuck_behavior?>">
         <center>
           NEW ID:<input type="text" name="id" size="10" value="<?=$suggestedid?>">
           <input type="submit" value="Copy NPC">