mirror/VentureChat
1
0
Fork 1
mirror of https://github.com/Aust1n46/VentureChat.git synced 2025-05-23 10:39:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added missing synchronization for bungee channels.

Browse Source
This commit is contained in:
Aust1n46 2021-04-18 14:49:33 -05:00
parent 83bc4e8482
commit dc3affef76
6 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mineverse/Aust1n46/chat/command/chat/Kickchannel.java
View File

@ -3,6 +3,7 @@ package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
@ -42,10 +43,16 @@ public class Kickchannel implements VentureCommand {
.replace("{channel_color}", channel.getColor() + "") .replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName())); .replace("{channel_name}", channel.getName()));
} }
else else {
player.setModified(true); player.setModified(true);
}
boolean isThereABungeeChannel = channel.getBungee();
if(player.getListening().size() == 0) { if(player.getListening().size() == 0) {
player.addListening(ChatChannel.getDefaultChannel().getName());
player.setCurrentChannel(ChatChannel.getDefaultChannel()); player.setCurrentChannel(ChatChannel.getDefaultChannel());
if(ChatChannel.getDefaultChannel().getBungee()) {
isThereABungeeChannel = true;
}
if(player.isOnline()) { if(player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString());
player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
@ -55,6 +62,9 @@ public class Kickchannel implements VentureCommand {
else else
player.setModified(true); player.setModified(true);
} }
if(isThereABungeeChannel) {
MineverseChat.synchronize(player, true);
}
return; return;
} }
sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());

19
src/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java
View File

@ -3,6 +3,7 @@ package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
@ -26,11 +27,26 @@ public class Kickchannelall implements VentureCommand {
.replace("{args}", args[0])); .replace("{args}", args[0]));
return; return;
} }
boolean isThereABungeeChannel = false;
for(String channel : player.getListening()) {
if(ChatChannel.isChannel(channel)) {
ChatChannel chatChannelObj = ChatChannel.getChannel(channel);
if(chatChannelObj.getBungee()) {
isThereABungeeChannel = true;
}
}
}
player.clearListening(); player.clearListening();
sender.sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_SENDER.toString() sender.sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_SENDER.toString()
.replace("{player}", player.getName())); .replace("{player}", player.getName()));
player.addListening(ChatChannel.getDefaultChannel().getName()); player.addListening(ChatChannel.getDefaultChannel().getName());
player.setCurrentChannel(ChatChannel.getDefaultChannel()); player.setCurrentChannel(ChatChannel.getDefaultChannel());
if(ChatChannel.getDefaultChannel().getBungee()) {
isThereABungeeChannel = true;
}
if(isThereABungeeChannel) {
MineverseChat.synchronize(player, true);
}
if(player.isOnline()) { if(player.isOnline()) {
player.getPlayer().sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_PLAYER.toString()); player.getPlayer().sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_PLAYER.toString());
player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString());
@ -38,8 +54,9 @@ public class Kickchannelall implements VentureCommand {
.replace("{channel_color}", ChatColor.valueOf(ChatChannel.getDefaultColor().toUpperCase()) + "") .replace("{channel_color}", ChatColor.valueOf(ChatChannel.getDefaultColor().toUpperCase()) + "")
.replace("{channel_name}", ChatChannel.getDefaultChannel().getName())); .replace("{channel_name}", ChatChannel.getDefaultChannel().getName()));
} }
else else {
player.setModified(true); player.setModified(true);
}
return; return;
} }
sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());

6
src/mineverse/Aust1n46/chat/command/chat/Leave.java
View File

@ -32,15 +32,19 @@ public class Leave implements VentureCommand {
mcp.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString() mcp.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString()
.replace("{channel_color}", channel.getColor() + "") .replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName())); .replace("{channel_name}", channel.getName()));
boolean isThereABungeeChannel = channel.getBungee();
if(mcp.getListening().size() == 0) { if(mcp.getListening().size() == 0) {
mcp.addListening(ChatChannel.getDefaultChannel().getName()); mcp.addListening(ChatChannel.getDefaultChannel().getName());
mcp.setCurrentChannel(ChatChannel.getDefaultChannel()); mcp.setCurrentChannel(ChatChannel.getDefaultChannel());
if(ChatChannel.getDefaultChannel().getBungee()) {
isThereABungeeChannel = true;
}
mcp.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); mcp.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString());
mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
.replace("{channel_color}", ChatColor.valueOf(ChatChannel.getDefaultColor().toUpperCase()) + "") .replace("{channel_color}", ChatColor.valueOf(ChatChannel.getDefaultColor().toUpperCase()) + "")
.replace("{channel_name}", ChatChannel.getDefaultChannel().getName())); .replace("{channel_name}", ChatChannel.getDefaultChannel().getName()));
} }
if(channel.getBungee()) { if(isThereABungeeChannel) {
MineverseChat.synchronize(mcp, true); MineverseChat.synchronize(mcp, true);
} }
return; return;

4
src/mineverse/Aust1n46/chat/command/chat/Listen.java
View File

@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
@ -37,6 +38,9 @@ public class Listen implements VentureCommand {
mcp.getPlayer().sendMessage(LocalizedMessage.LISTEN_CHANNEL.toString() mcp.getPlayer().sendMessage(LocalizedMessage.LISTEN_CHANNEL.toString()
.replace("{channel_color}", channel.getColor() + "") .replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName())); .replace("{channel_name}", channel.getName()));
if(channel.getBungee()) {
MineverseChat.synchronize(mcp, true);
}
return; return;
} }
mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()

7
src/mineverse/Aust1n46/chat/command/chat/Setchannel.java
View File

@ -2,6 +2,7 @@ package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
@ -70,8 +71,12 @@ public class Setchannel implements VentureCommand {
player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString()
.replace("{channel_color}", channel.getColor() + "") .replace("{channel_color}", channel.getColor() + "")
.replace("{channel_name}", channel.getName())); .replace("{channel_name}", channel.getName()));
else else {
player.setModified(true); player.setModified(true);
}
if(channel.getBungee()) {
MineverseChat.synchronize(player, true);
}
return; return;
} }
sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());

8
src/mineverse/Aust1n46/chat/command/chat/Setchannelall.java
View File

@ -2,6 +2,7 @@ package mineverse.Aust1n46.chat.command.chat;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
@ -25,6 +26,7 @@ public class Setchannelall implements VentureCommand {
.replace("{args}", args[0])); .replace("{args}", args[0]));
return; return;
} }
boolean isThereABungeeChannel = false;
for(ChatChannel channel : ChatChannel.getChatChannels()) { for(ChatChannel channel : ChatChannel.getChatChannels()) {
if(channel.hasPermission()) { if(channel.hasPermission()) {
if(!player.isOnline()) { if(!player.isOnline()) {
@ -41,6 +43,9 @@ public class Setchannelall implements VentureCommand {
else { else {
player.addListening(channel.getName()); player.addListening(channel.getName());
} }
if(channel.getBungee()) {
isThereABungeeChannel = true;
}
} }
sender.sendMessage(LocalizedMessage.SET_CHANNEL_ALL_SENDER.toString() sender.sendMessage(LocalizedMessage.SET_CHANNEL_ALL_SENDER.toString()
.replace("{player}", player.getName())); .replace("{player}", player.getName()));
@ -48,6 +53,9 @@ public class Setchannelall implements VentureCommand {
player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL_ALL_PLAYER.toString()); player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL_ALL_PLAYER.toString());
else else
player.setModified(true); player.setModified(true);
if(isThereABungeeChannel) {
MineverseChat.synchronize(player, true);
}
return; return;
} }
sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());