Upstream
/
Advanced-Portals
mirror of https://github.com/sekwah41/Advanced-Portals.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up code a little and alter tags

This commit is contained in:
Sekwah 2021-02-01 00:59:23 +00:00
parent 5ee12d7696
commit ecd11a7f34
No known key found for this signature in database
GPG Key ID: C3BE2E6C861A461A
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java
View File

@ -207,8 +207,6 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
String serverName = null;
String permission = null;
String portalCommand = null;
String particleDisp = null;
String particleDest = null;
ArrayList<PortalArg> extraData = new ArrayList<>();
@ -233,9 +231,6 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
} else if (startsWithPortalArg("triggerblock:", args[i])) {
hasTriggerBlock = true;
triggerBlock = args[i].toLowerCase().replaceFirst("triggerblock:", "");
} else if (startsWithPortalArg("triggerblock:", args[i])) {
hasTriggerBlock = true;
triggerBlock = args[i].toLowerCase().replaceFirst("triggerblock:", "");
} else if (this.startsWithPortalArg("bungee:", args[i])) {
isBungeePortal = true;
serverName = args[i].substring("bungee:".length());
@ -304,12 +299,12 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
} else if (startsWithPortalArg("leavedesti:", args[i])) {
String leaveDesti = parseArgVariable(args, i, "leavedesti:");
extraData.add(new PortalArg("leavedesti", leaveDesti));
} else if (startsWithPortalArg("particledisp:", args[i])) {
String value = parseArgVariable(args, i, "particledisp:");
extraData.add(new PortalArg("particledisp", value));
} else if (startsWithPortalArg("particledest:", args[i])) {
String value = parseArgVariable(args, i, "particledest:");
extraData.add(new PortalArg("particledest", value));
} else if (startsWithPortalArg("particlein:", args[i])) {
String value = parseArgVariable(args, i, "particlein:");
extraData.add(new PortalArg("particlein", value));
} else if (startsWithPortalArg("particleout:", args[i])) {
String value = parseArgVariable(args, i, "particleout:");
extraData.add(new PortalArg("particleout", value));
}
}
if (!hasName) {
@ -436,7 +431,7 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
" \u00A77Variables \u00A7c: " +
"\u00A7aname, triggerBlock, desti, destination, " +
"bungee, permission, command, cooldowndelay, leavedesti" +
"particledisp, particledest"
"particlein, particleout"
);
sender.sendMessage("");
sender.sendMessage("\u00A7aExample command: \u00A7e/portal create name:test triggerId:portal");
@ -944,10 +939,10 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
case "cooldowndelay":
hasCooldownDelay = true;
break;
case "particledisp":
case "particlein":
hasDispParticle = true;
break;
case "particledest":
case "particleout":
hasDestParticle = true;
break;
}
@ -984,10 +979,10 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
autoComplete.add("leavedesti:");
}
if (!hasDispParticle) {
autoComplete.add("particledisp:");
autoComplete.add("particlein:");
}
if (!hasDestParticle) {
autoComplete.add("particledest:");
autoComplete.add("particleout:");
}
}
}
@ -1031,8 +1026,8 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
autoComplete.add(tagStart + object.toString());
}
}
if (args[args.length - 1].startsWith("particledisp:") || args[args.length - 1].startsWith("particledest:")) {
String tagStart = args[args.length - 1].startsWith("particledisp:") ? "particledisp:" : "particledest:";
if (args[args.length - 1].startsWith("particlein:") || args[args.length - 1].startsWith("particleout:")) {
String tagStart = args[args.length - 1].startsWith("particlein:") ? "particlein:" : "particleout:";
for (Particle particle : Particle.values()) {
if(particle.getDataType() != Void.class)
continue;

8
src/main/java/com/sekwah/advancedportals/bukkit/destinations/Destination.java
View File

@ -131,8 +131,8 @@ public class Destination {
loc.setPitch((float) config.getConfig().getDouble(dest + ".pos.pitch"));
loc.setYaw((float) config.getConfig().getDouble(dest + ".pos.yaw"));
if (disp != null && disp.getArg("particledisp") != null) {
WarpEffects.activateParticle(player, disp.getArg("particledisp"));
if (disp != null && disp.getArg("particlein") != null) {
WarpEffects.activateParticle(player, disp.getArg("particlein"));
}
if(!noEffects) {
@ -154,8 +154,8 @@ public class Destination {
player.teleport(loc, PlayerTeleportEvent.TeleportCause.PLUGIN);
}
if (disp != null && disp.getArg("particledest") != null) {
WarpEffects.activateParticle(player, disp.getArg("particledest"));
if (disp != null && disp.getArg("particleout") != null) {
WarpEffects.activateParticle(player, disp.getArg("particleout"));
}
if(!noEffects) {
WarpEffects.activateEffect(player);