Extracts some portal creation code into separate methods

src/main/java/net/knarcraft/stargate/portal/Portal.java

@@ -22,7 +22,6 @@ import org.bukkit.block.Sign;
 import org.bukkit.block.data.Bisected;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Orientable;
-import org.bukkit.block.data.Powerable;
 import org.bukkit.block.data.type.Slab;
 import org.bukkit.entity.AbstractHorse;
 import org.bukkit.entity.Boat;
@@ -42,7 +41,7 @@ import java.util.UUID;
 import java.util.logging.Level;
 
 /**
- * This class represents a portal in space which points to one or several other portals
+ * This class represents a portal in space which points to one or several portals
  */
 public class Portal {
 
@@ -569,7 +568,8 @@ public class Portal {
             Portal end = getDestination();
 
             if (end != null && end.isOpen()) {
-                end.deactivate(); // Clear it's destination first.
+                //Clear its destination first
+                end.deactivate();
                 end.close(false);
             }
         }

src/main/java/net/knarcraft/stargate/portal/PortalHandler.java

@@ -395,25 +395,24 @@ public class PortalHandler {
             }
         }
 
-        BlockLocation button = null;
         Portal portal;
-        portal = new Portal(topLeft, modX, modZ, yaw, id, button, destinationName, name, false, network,
+        portal = new Portal(topLeft, modX, modZ, yaw, id, null, destinationName, name, false, network,
                 gate, player.getUniqueId(), player.getName(), portalOptions);
 
         int cost = EconomyHandler.getCreateCost(player, gate);
 
         // Call StargateCreateEvent
-        StargateCreateEvent cEvent = new StargateCreateEvent(player, portal, event.getLines(), deny, denyMsg, cost);
+        StargateCreateEvent stargateCreateEvent = new StargateCreateEvent(player, portal, event.getLines(), deny, denyMsg, cost);
-        Stargate.server.getPluginManager().callEvent(cEvent);
+        Stargate.server.getPluginManager().callEvent(stargateCreateEvent);
-        if (cEvent.isCancelled()) {
+        if (stargateCreateEvent.isCancelled()) {
             return null;
         }
-        if (cEvent.getDeny()) {
+        if (stargateCreateEvent.getDeny()) {
-            Stargate.sendErrorMessage(player, cEvent.getDenyReason());
+            Stargate.sendErrorMessage(player, stargateCreateEvent.getDenyReason());
             return null;
         }
 
-        cost = cEvent.getCost();
+        cost = stargateCreateEvent.getCost();
 
         // Name & Network can be changed in the event, so do these checks here.
         if (portal.getName().length() < 1 || portal.getName().length() > 11) {
@@ -455,42 +454,16 @@ public class PortalHandler {
 
         //No button on an always-open portal.
         if (!portalOptions.get(PortalOption.ALWAYS_ON)) {
-            button = topLeft.modRelative(buttonVector.getRight(), buttonVector.getDepth(), buttonVector.getDistance() + 1, modX, 1, modZ);
+            generatePortalButton(portal, topLeft, buttonVector, buttonFacing);
-            Directional buttonData = (Directional) Bukkit.createBlockData(gate.getPortalButton());
-            buttonData.setFacing(buttonFacing);
-            button.getBlock().setBlockData(buttonData);
-            portal.setButton(button);
         }
 
+        //Register the new portal
         registerPortal(portal);
-        portal.drawSign();
+        updateNewPortal(portal, destinationName);
-        //Open an always on portal
-        if (portal.isRandom() || portal.isBungee()) {
-            portal.open(true);
-        } else if (portal.isAlwaysOn()) {
-            Portal dest = getByName(destinationName, portal.getNetwork());
-            if (dest != null) {
-                portal.open(true);
-                dest.drawSign();
-            }
-            // Set the inside of the gate to its closed material
-        } else {
-            for (BlockLocation inside : portal.getEntrances()) {
-                inside.setType(portal.getGate().getPortalClosedBlock());
-            }
-        }
 
-        //Don't do network stuff for bungee portals
+        //Update portals pointing at this one if it's not a bungee portal
         if (!portal.isBungee()) {
-            //Open any always on portal pointing at this portal
+            updatePortalsPointingAtNewPortal(portal);
-            for (String originName : allPortalNetworks.get(portal.getNetwork().toLowerCase())) {
-                Portal origin = getByName(originName, portal.getNetwork());
-                if (origin == null) continue;
-                if (!origin.getDestinationName().equalsIgnoreCase(portal.getName())) continue;
-                if (!origin.isVerified()) continue;
-                if (origin.isFixed()) origin.drawSign();
-                if (origin.isAlwaysOn()) origin.open(true);
-            }
         }
 
         saveAllPortals(portal.getWorld());
@@ -498,6 +471,73 @@ public class PortalHandler {
         return portal;
     }
 
+    /**
+     * Generates a button for a portal
+     *
+     * @param portal       <p>The portal to generate a button for</p>
+     * @param topLeft      <p>The top-left block of the portal</p>
+     * @param buttonVector <p>A relative vector pointing at the button</p>
+     * @param buttonFacing <p>The direction the button should be facing</p>
+     */
+    private static void generatePortalButton(Portal portal, BlockLocation topLeft, RelativeBlockVector buttonVector,
+                                             BlockFace buttonFacing) {
+        BlockLocation button = topLeft.modRelative(buttonVector.getRight(), buttonVector.getDepth(),
+                buttonVector.getDistance() + 1, portal.getModX(), 1, portal.getModZ());
+        Directional buttonData = (Directional) Bukkit.createBlockData(portal.getGate().getPortalButton());
+        buttonData.setFacing(buttonFacing);
+        button.getBlock().setBlockData(buttonData);
+        portal.setButton(button);
+    }
+
+    /**
+     * Updates the open state of the newly created portal
+     *
+     * @param portal          <p>The portal newly created</p>
+     * @param destinationName <p>The name of the destination portal</p>
+     */
+    private static void updateNewPortal(Portal portal, String destinationName) {
+        portal.drawSign();
+        //Open an always on portal
+        if (portal.isRandom() || portal.isBungee()) {
+            portal.open(true);
+        } else if (portal.isAlwaysOn()) {
+            Portal destinationPortal = getByName(destinationName, portal.getNetwork());
+            if (destinationPortal != null) {
+                portal.open(true);
+                destinationPortal.drawSign();
+            }
+        } else {
+            //Update the block type for the portal's opening to the closed block
+            for (BlockLocation entrance : portal.getEntrances()) {
+                entrance.setType(portal.getGate().getPortalClosedBlock());
+            }
+        }
+    }
+
+    /**
+     * Updates the sign and open state of portals pointing at the newly created portal
+     *
+     * @param portal <p>The newly created portal</p>
+     */
+    private static void updatePortalsPointingAtNewPortal(Portal portal) {
+        for (String originName : allPortalNetworks.get(portal.getNetwork().toLowerCase())) {
+            Portal origin = getByName(originName, portal.getNetwork());
+            if (origin == null ||
+                    !origin.getDestinationName().equalsIgnoreCase(portal.getName()) ||
+                    !origin.isVerified()) {
+                continue;
+            }
+            //Update sign of fixed gates pointing at this gate
+            if (origin.isFixed()) {
+                origin.drawSign();
+            }
+            //Open any always on portal pointing at this portal
+            if (origin.isAlwaysOn()) {
+                origin.open(true);
+            }
+        }
+    }
+
     /**
      * Gets all portal options to be applied to a new portal
      *