Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität

Merge branch 'master' into Teamserver

Quellcode durchsuchen
Dieser Commit ist enthalten in:
YoyoNow 2022-04-22 21:37:02 +02:00
Commit c976e6f7ce
9 geänderte Dateien mit 25 neuen und 26 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
src/de/steamwar/bungeecore/Message.java
Datei anzeigen

@ -108,7 +108,7 @@ public class Message {
if(type == ChatMessageType.CHAT && !sender.chatShown()) if(type == ChatMessageType.CHAT && !sender.chatShown())
return; return;
sender.send(prefixed, type, new Message("PLAIN_STRING", onHover), onClick, new Message(message, params)); sender.send(prefixed, type, onHover != null ? new Message("PLAIN_STRING", onHover) : null, onClick, new Message(message, params));
} }
public static void broadcast(String message, Object... params) { public static void broadcast(String message, Object... params) {
@ -116,7 +116,7 @@ public class Message {
} }
public static void broadcast(String message, String onHover, ClickEvent onClick, Object... params) { public static void broadcast(String message, String onHover, ClickEvent onClick, Object... params) {
ChatSender.allReceivers().forEach(player -> player.prefixless(message, new Message(onHover, params), onClick, params)); ChatSender.allReceivers().forEach(player -> player.system(message, onHover != null ? new Message(onHover, params) : null, onClick, params));
} }
public static void team(String message, Object... params) { public static void team(String message, Object... params) {
@ -124,7 +124,7 @@ public class Message {
} }
public static void team(String message, String onHover, ClickEvent onClick, Object... params) { public static void team(String message, String onHover, ClickEvent onClick, Object... params) {
ChatSender.serverteamReceivers().filter(player -> player.user().getUserGroup().isTeamGroup()).forEach(player -> player.prefixless(message, new Message(onHover, params), onClick, params)); ChatSender.serverteamReceivers().filter(player -> player.user().getUserGroup().isTeamGroup()).forEach(player -> player.prefixless(message, onHover != null ? new Message(onHover, params) : null, onClick, params));
} }
private final String format; private final String format;

2
src/de/steamwar/bungeecore/bot/listeners/DiscordChatListener.java
Datei anzeigen

@ -57,7 +57,7 @@ public class DiscordChatListener extends BasicDiscordListener {
if (steamwarUser == null || event.getMessage().getContentRaw().length() > 250 || steamwarUser.isPunished(Punishment.PunishmentType.Ban)) { if (steamwarUser == null || event.getMessage().getContentRaw().length() > 250 || steamwarUser.isPunished(Punishment.PunishmentType.Ban)) {
event.getMessage().delete().queue(); event.getMessage().delete().queue();
} else { } else {
ChatListener.sendChat(ChatSender.of(event.getMessage(), steamwarUser), targets.get(), format, event.getMessage().getContentDisplay().replace('§', '&').replace('\n', ' ')); ChatListener.sendChat(ChatSender.of(event.getMessage(), steamwarUser), targets.get(), format, null, event.getMessage().getContentDisplay().replace('§', '&').replace('\n', ' '));
} }
} }

5
src/de/steamwar/bungeecore/commands/ArenaCommand.java
Datei anzeigen

@ -19,8 +19,8 @@
package de.steamwar.bungeecore.commands; package de.steamwar.bungeecore.commands;
import de.steamwar.bungeecore.Arenaserver;
import de.steamwar.bungeecore.Message; import de.steamwar.bungeecore.Message;
import de.steamwar.bungeecore.Servertype;
import de.steamwar.bungeecore.Subserver; import de.steamwar.bungeecore.Subserver;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ProxyServer;
@ -40,7 +40,8 @@ public class ArenaCommand extends BasicCommand {
ProxiedPlayer player = (ProxiedPlayer) sender; ProxiedPlayer player = (ProxiedPlayer) sender;
ServerInfo server = ProxyServer.getInstance().getServerInfo(String.join(" ", args)); ServerInfo server = ProxyServer.getInstance().getServerInfo(String.join(" ", args));
if(server == null || !(Subserver.getSubserver(server) instanceof Arenaserver)) { Subserver subserver = Subserver.getSubserver(server);
if(server == null || subserver == null || subserver.getType() != Servertype.ARENA) {
Message.send("ARENA_NOT_FOUND", player); Message.send("ARENA_NOT_FOUND", player);
return; return;
} }

3
src/de/steamwar/bungeecore/commands/MsgCommand.java
Datei anzeigen

@ -63,7 +63,8 @@ public class MsgCommand extends BasicCommand {
return; return;
} }
ChatListener.sendChat(sender, Stream.of(sender, ChatSender.of(target)), "CHAT_MSG", String.join(" ", args)); ChatSender receiver = ChatSender.of(target);
ChatListener.sendChat(sender, Stream.of(sender, receiver), "CHAT_MSG", receiver, String.join(" ", args));
lastChats.put(player, target); lastChats.put(player, target);
lastChats.put(target, player); lastChats.put(target, player);
} }

2
src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java
Datei anzeigen

@ -37,6 +37,6 @@ public class ServerTeamchatCommand extends BasicCommand {
return; return;
} }
ChatListener.sendChat(sender, ChatSender.serverteamReceivers(), "CHAT_SERVERTEAM", String.join(" ", args)); ChatListener.sendChat(sender, ChatSender.serverteamReceivers(), "CHAT_SERVERTEAM", null, String.join(" ", args));
} }
} }

2
src/de/steamwar/bungeecore/commands/TeamchatCommand.java
Datei anzeigen

@ -44,6 +44,6 @@ public class TeamchatCommand extends BasicCommand {
return; return;
} }
ChatListener.sendChat(sender, ChatSender.allReceivers().filter(player -> player.user().getTeam() == user.getTeam()), "CHAT_TEAM", String.join(" ", args)); ChatListener.sendChat(sender, ChatSender.allReceivers().filter(player -> player.user().getTeam() == user.getTeam()), "CHAT_TEAM", null, String.join(" ", args));
} }
} }

4
src/de/steamwar/bungeecore/commands/TpCommand.java
Datei anzeigen

@ -57,7 +57,7 @@ public class TpCommand extends BasicCommand {
//Give control of teleport command to server //Give control of teleport command to server
if(server == null) { if(server == null) {
player.chat("/teleport " + String.join(" ", args)); player.chat("/tp " + String.join(" ", args));
return; return;
} }
@ -81,7 +81,7 @@ public class TpCommand extends BasicCommand {
String serverPerm = BungeeCore.serverPermissions.get(server.getName()); String serverPerm = BungeeCore.serverPermissions.get(server.getName());
Subserver subserver = Subserver.getSubserver(server); Subserver subserver = Subserver.getSubserver(server);
if (subserver instanceof Arenaserver) { if (subserver != null && subserver.getType() == Servertype.ARENA) {
if (!sender.user().isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer)) if (!sender.user().isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer))
SubserverSystem.sendPlayer(subserver, player); SubserverSystem.sendPlayer(subserver, player);

20
src/de/steamwar/bungeecore/listeners/ChatListener.java
Datei anzeigen

@ -69,17 +69,17 @@ public class ChatListener extends BasicListener {
e.setCancelled(true); e.setCancelled(true);
Subserver subserver = Subserver.getSubserver(player); Subserver subserver = Subserver.getSubserver(player);
if(subserver instanceof Arenaserver && subserver.getServer() == player.getServer().getInfo()) { if(subserver != null && subserver.getType() == Servertype.ARENA && subserver.getServer() == player.getServer().getInfo()) {
localChat(player, message); localChat(player, message);
} else if (message.startsWith("+")) { } else if (message.startsWith("+")) {
localChat(player, message.substring(1)); localChat(player, message.substring(1));
} else { } else {
sendChat(ChatSender.of(player), ChatSender.globalReceivers(), "CHAT_GLOBAL", message); sendChat(ChatSender.of(player), ChatSender.globalReceivers(), "CHAT_GLOBAL", null, message);
} }
} }
} }
public static void sendChat(ChatSender sender, Stream<ChatSender> receivers, String format, String message) { public static void sendChat(ChatSender sender, Stream<ChatSender> receivers, String format, ChatSender msgReceiver, String message) {
String finalMessage = modifyFilter(sender, message); String finalMessage = modifyFilter(sender, message);
if(finalMessage == null) if(finalMessage == null)
return; return;
@ -90,17 +90,17 @@ public class ChatListener extends BasicListener {
receivers.filter(ChatSender::chatShown).forEach(player -> { receivers.filter(ChatSender::chatShown).forEach(player -> {
if(sender.user().getId() != player.user().getId()) if(sender.user().getId() != player.user().getId())
noReceiver.set(false); noReceiver.set(false);
chatToReciever(player, user, format, finalMessage); chatToReciever(player, msgReceiver, user, format, finalMessage);
}); });
chatToReciever(ChatSender.console(), user, format, finalMessage); chatToReciever(ChatSender.console(), msgReceiver, user, format, finalMessage);
if(format.equals("CHAT_GLOBAL")) { if(format.equals("CHAT_GLOBAL")) {
if (SteamwarDiscordBot.instance() != null) if (SteamwarDiscordBot.instance() != null)
chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getIngameChatListener()), user, format, finalMessage); chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getIngameChatListener()), msgReceiver, user, format, finalMessage);
} else if (format.equals("CHAT_SERVERTEAM")) { } else if (format.equals("CHAT_SERVERTEAM")) {
if (SteamwarDiscordBot.instance() != null) if (SteamwarDiscordBot.instance() != null)
chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getServerTeamChatListener()), user, format, finalMessage); chatToReciever(ChatSender.discordChannel(SteamwarDiscordBot.instance().getServerTeamChatListener()), msgReceiver, user, format, finalMessage);
} else if (noReceiver.get()) { } else if (noReceiver.get()) {
sender.system("CHAT_NO_RECEIVER"); sender.system("CHAT_NO_RECEIVER");
} }
@ -153,16 +153,16 @@ public class ChatListener extends BasicListener {
return message; return message;
} }
private static void chatToReciever(ChatSender receiver, SteamwarUser sender, String format, String message) { private static void chatToReciever(ChatSender receiver, ChatSender msgReceiver, SteamwarUser sender, String format, String message) {
UserGroup group = sender.getUserGroup(); UserGroup group = sender.getUserGroup();
receiver.chat(new Message(format, receiver.chat(new Message(format,
sender, sender,
receiver, msgReceiver == null ? receiver : msgReceiver,
highlightMentions(message, group.getChatColorCode(), receiver), highlightMentions(message, group.getChatColorCode(), receiver),
sender.getTeam() == 0 ? "" : "§" + Team.get(sender.getTeam()).getTeamColor() + Team.get(sender.getTeam()).getTeamKuerzel() + " ", sender.getTeam() == 0 ? "" : "§" + Team.get(sender.getTeam()).getTeamColor() + Team.get(sender.getTeam()).getTeamKuerzel() + " ",
UserElo.getEmblem(sender), UserElo.getEmblem(sender),
group.getColorCode(), group.getColorCode(),
group.getChatPrefix() + " ", group.getChatPrefix().length() == 0 ? "§f" : group.getChatPrefix() + " ",
group.getChatColorCode())); group.getChatColorCode()));
} }

7
src/de/steamwar/messages/ChatSender.java
Datei anzeigen

@ -19,10 +19,7 @@
package de.steamwar.messages; package de.steamwar.messages;
import de.steamwar.bungeecore.Arenaserver; import de.steamwar.bungeecore.*;
import de.steamwar.bungeecore.BungeeCore;
import de.steamwar.bungeecore.Message;
import de.steamwar.bungeecore.Subserver;
import de.steamwar.bungeecore.bot.listeners.DiscordChatListener; import de.steamwar.bungeecore.bot.listeners.DiscordChatListener;
import de.steamwar.bungeecore.sql.SteamwarUser; import de.steamwar.bungeecore.sql.SteamwarUser;
import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.ChatMessageType;
@ -59,7 +56,7 @@ public interface ChatSender {
static Stream<ChatSender> globalReceivers() { static Stream<ChatSender> globalReceivers() {
return all().filter(player -> { return all().filter(player -> {
Subserver subserver = Subserver.getSubserver(player); Subserver subserver = Subserver.getSubserver(player);
return !(subserver instanceof Arenaserver && subserver.getServer() == player.getServer().getInfo()); return subserver == null || !(subserver.getType() == Servertype.ARENA && subserver.getServer() == player.getServer().getInfo());
}).map(ChatSender::of); }).map(ChatSender::of);
} }