Upstream/PlayerBalancer
1
0
Fork 0
mirror of https://github.com/BGHDDevelopment/PlayerBalancer.git synced 2024-11-09 04:20:32 +01:00
Code Issues Projects Releases Wiki Activity

Added back the ability to get connected to the same section

Browse Source
This commit is contained in:
Jaime Martínez Rincón 2017-12-27 23:07:39 +01:00
parent 8db9300820
commit 2c0b36c0cd
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Main Plugin/pom.xml
View File

@ -11,7 +11,7 @@
<name>PlayerBalancer Plugin</name>
<artifactId>playerbalancer-plugin</artifactId>
<version>2.1.4</version>
<version>2.1.4.1</version>
<build>
<finalName>PlayerBalancer</finalName>

18
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java
View File

@ -32,14 +32,6 @@ public abstract class ConnectionIntent {
throw new IllegalStateException("The servers list parameter is the same reference, this cannot happen");
}
Server current = player.getServer();
if (current != null) {
if (section.getServers().contains(current.getInfo())) {
MessageUtils.send(player, plugin.getSettings().getMessagesProps().getSameSectionMessage());
return;
}
}
if (section.getImplicitProvider() != ProviderType.NONE) {
ServerInfo target = this.fetchServer(player, section, provider, servers);
if (target != null) {
@ -101,6 +93,16 @@ public abstract class ConnectionIntent {
//TODO Create this as a type
public static void simple(PlayerBalancer plugin, ProxiedPlayer player, ServerSection section) {
//TODO Make this apply to all situations except kicks
//TODO (It already works like that, but I want a better way)
Server current = player.getServer();
if (current != null) {
if (section.getServers().contains(current.getInfo())) {
MessageUtils.send(player, plugin.getSettings().getMessagesProps().getSameSectionMessage());
return;
}
}
new ConnectionIntent(plugin, player, section) {
@Override
public void connect(ServerInfo server, Callback<Boolean> callback) {

6
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerKickListener.java
View File

@ -51,10 +51,10 @@ public class ServerKickListener implements Listener {
}
if (props.isDebug()) {
plugin.getLogger().info(String.format("The player %s got kicked from %s, reason: %s. Matched reasons: %s",
plugin.getLogger().info(String.format("The player %s got kicked from %s, reason: \"%s\". Matched reasons: %s",
player.getName(),
from.getName(),
TextComponent.toPlainText(event.getKickReasonComponent()),
reason,
matches
));
}
@ -78,7 +78,7 @@ public class ServerKickListener implements Listener {
event.setCancelled(true);
event.setCancelServer(server);
MessageUtils.send(player, messages.getKickMessage(), (str) -> str
.replace("{reason}", event.getKickReason())
.replace("{reason}", reason)
.replace("{from}", from.getName())
.replace("{to}", server.getName()));
plugin.getProxy().getScheduler().schedule(plugin, () -> {

4
Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/MessageUtils.java
View File

@ -26,5 +26,9 @@ public final class MessageUtils {
return string.replace(ChatColor.COLOR_CHAR, '&');
}
public static String safePrint(String string) {
return string.replace(ChatColor.COLOR_CHAR, '\u00A7');
}
private MessageUtils() {}
}

2
Main Plugin/src/main/resources/default.conf
View File

@ -33,7 +33,7 @@ messages {
invalid-input="&cThis is an invalid input type for this command"
misc-failure="&cCould not find a server to get connected to"
player-bypass="&cYou have not been moved because you have the playerbalancer.bypass permission"
player-kicked="&cYou have been kicked from &a{from} &cand you are being moved to &a{to}, reason: &a{reason}"
player-kicked="&cYou have been kicked from &a{from} &cso you are being moved to &a{to}\n&cReason: &a{reason}"
same-section="&cYou are already connected to a server on this section!"
unavailable-server="&cThis command cannot be executed on this server"
unknown-section="&aCould not find a section with that name"