EpicKnarvik97/Stargate
EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Makes the max portal name and network character limit more easily changeable

Browse Source
This commit is contained in:
Kristian Knarvik 2021-11-13 19:28:17 +01:00
parent 51f5420f9e
commit 29c1a00fcd
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/knarcraft/stargate/Stargate.java
View File

@ -139,6 +139,15 @@ public class Stargate extends JavaPlugin {
return logger; return logger;
} }
/**
* Gets the max length of portal names and networks
*
* @return <p>The max portal name/network length</p>
*/
public static int getMaxNameNetworkLength() {
return 13;
}
/** /**
* Sends a debug message * Sends a debug message
* *

14
src/main/java/net/knarcraft/stargate/portal/PortalCreator.java
View File

@ -22,6 +22,8 @@ import org.bukkit.event.block.SignChangeEvent;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static net.knarcraft.stargate.Stargate.getMaxNameNetworkLength;
/** /**
* The portal creator can create and validate a new portal * The portal creator can create and validate a new portal
*/ */
@ -105,7 +107,8 @@ public class PortalCreator {
Stargate.debug("createPortal", builder.toString()); Stargate.debug("createPortal", builder.toString());
//Use default network if a proper alternative is not set //Use default network if a proper alternative is not set
if (!portalOptions.get(PortalOption.BUNGEE) && (network.length() < 1 || network.length() > 11)) { if (!portalOptions.get(PortalOption.BUNGEE) && (network.length() < 1 || network.length() >
getMaxNameNetworkLength())) {
network = Stargate.getDefaultNetwork(); network = Stargate.getDefaultNetwork();
} }
@ -117,8 +120,8 @@ public class PortalCreator {
Stargate.debug("createPortal", "Player doesn't have create permissions on network. Trying personal"); Stargate.debug("createPortal", "Player doesn't have create permissions on network. Trying personal");
if (PermissionHelper.canCreatePersonalPortal(player)) { if (PermissionHelper.canCreatePersonalPortal(player)) {
network = player.getName(); network = player.getName();
if (network.length() > 11) { if (network.length() > getMaxNameNetworkLength()) {
network = network.substring(0, 11); network = network.substring(0, getMaxNameNetworkLength());
} }
Stargate.debug("createPortal", "Creating personal portal"); Stargate.debug("createPortal", "Creating personal portal");
Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("createPersonal")); Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("createPersonal"));
@ -228,8 +231,9 @@ public class PortalCreator {
*/ */
private boolean checkIfNewPortalIsValid(int cost, String portalName) { private boolean checkIfNewPortalIsValid(int cost, String portalName) {
//Check if the portal name can fit on the sign with padding (>name<) //Check if the portal name can fit on the sign with padding (>name<)
if (portal.getCleanName().length() < 1 || portal.getCleanName().length() > 13) { if (portal.getCleanName().length() < 1 || portal.getCleanName().length() > getMaxNameNetworkLength()) {
Stargate.debug("createPortal", "Name length error"); Stargate.debug("createPortal", String.format("Name length error. %s is too long.",
portal.getCleanName()));
Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("createNameLength")); Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("createNameLength"));
return false; return false;
} }

6
src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java
View File

@ -8,6 +8,8 @@ import net.knarcraft.stargate.portal.teleporter.PlayerTeleporter;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import static net.knarcraft.stargate.Stargate.getMaxNameNetworkLength;
/** /**
* Helper class for deciding which actions a player is allowed to perform * Helper class for deciding which actions a player is allowed to perform
*/ */
@ -200,8 +202,8 @@ public final class PermissionHelper {
} }
//Is able to create personal gates (Assumption is made they can also access them) //Is able to create personal gates (Assumption is made they can also access them)
String playerName = player.getName(); String playerName = player.getName();
if (playerName.length() > 11) { if (playerName.length() > getMaxNameNetworkLength()) {
playerName = playerName.substring(0, 11); playerName = playerName.substring(0, getMaxNameNetworkLength());
} }
return !network.equals(playerName) || !hasPermission(player, "stargate.create.personal"); return !network.equals(playerName) || !hasPermission(player, "stargate.create.personal");
} }