Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-09-26 22:22:37 +02:00
Code Issues Projects Releases Wiki Activity

Only send multiplayer messages if not blank, per #958

Browse Source
This commit is contained in:
PikaMug 2019-10-09 01:24:42 -04:00
parent 2ff88a425d
commit cfb3bf7d3d
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java
View File

@ -27,13 +27,17 @@ import me.blackvein.quests.util.Lang;
public class DungeonsListener implements Listener { public class DungeonsListener implements Listener {
@EventHandler @EventHandler
public void onGroupCreate(DGroupCreateEvent event) { public void onGroupCreate(DGroupCreateEvent event) {
if (Lang.get("questDungeonsCreate").length() > 0) {
event.getCreator().sendMessage(ChatColor.YELLOW + Lang.get("questDungeonsCreate")); event.getCreator().sendMessage(ChatColor.YELLOW + Lang.get("questDungeonsCreate"));
} }
}
@EventHandler @EventHandler
public void onGroupDisbandEvent(DGroupDisbandEvent event) { public void onGroupDisbandEvent(DGroupDisbandEvent event) {
if (Lang.get("questDungeonsDisband").length() > 0) {
event.getDisbander().sendMessage(ChatColor.RED + Lang.get("questDungeonsDisband")); event.getDisbander().sendMessage(ChatColor.RED + Lang.get("questDungeonsDisband"));
} }
}
@EventHandler @EventHandler
public void onPlayerJoinEvent(DPlayerJoinDGroupEvent event) { public void onPlayerJoinEvent(DPlayerJoinDGroupEvent event) {
@ -41,11 +45,15 @@ public class DungeonsListener implements Listener {
Player i = event.getDGroup().getCaptain(); Player i = event.getDGroup().getCaptain();
Player p = event.getDPlayer().getPlayer(); Player p = event.getDPlayer().getPlayer();
if (i != null && p != null) { if (i != null && p != null) {
if (Lang.get("questDungeonsInvite").length() > 0) {
i.sendMessage(ChatColor.GREEN + Lang.get(i, "questDungeonsInvite").replace("<player>", p.getName())); i.sendMessage(ChatColor.GREEN + Lang.get(i, "questDungeonsInvite").replace("<player>", p.getName()));
}
if (Lang.get("questDungeonsJoin").length() > 0) {
p.sendMessage(ChatColor.GREEN + Lang.get(p, "questDungeonsJoin").replace("<player>", i.getName())); p.sendMessage(ChatColor.GREEN + Lang.get(p, "questDungeonsJoin").replace("<player>", i.getName()));
} }
} }
} }
}
@EventHandler @EventHandler
public void onPlayerLeaveEvent(DPlayerLeaveDGroupEvent event) { public void onPlayerLeaveEvent(DPlayerLeaveDGroupEvent event) {
@ -53,9 +61,13 @@ public class DungeonsListener implements Listener {
Player k = event.getDGroup().getCaptain(); Player k = event.getDGroup().getCaptain();
Player p = event.getDPlayer().getPlayer(); Player p = event.getDPlayer().getPlayer();
if (k != null && p != null) { if (k != null && p != null) {
if (Lang.get("questDungeonsKicked").length() > 0) {
k.sendMessage(ChatColor.RED + Lang.get(k, "questDungeonsKicked").replace("<player>", k.getName())); k.sendMessage(ChatColor.RED + Lang.get(k, "questDungeonsKicked").replace("<player>", k.getName()));
}
if (Lang.get("questDungeonsLeave").length() > 0) {
p.sendMessage(ChatColor.RED + Lang.get(p, "questDungeonsLeave").replace("<player>", p.getName())); p.sendMessage(ChatColor.RED + Lang.get(p, "questDungeonsLeave").replace("<player>", p.getName()));
} }
} }
} }
}
} }

12
main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java
View File

@ -32,46 +32,58 @@ public class PartiesListener implements Listener {
if (event.getCreator() != null) { if (event.getCreator() != null) {
Player p = Bukkit.getServer().getPlayer(event.getCreator().getPlayerUUID()); Player p = Bukkit.getServer().getPlayer(event.getCreator().getPlayerUUID());
if (p != null) { if (p != null) {
if (Lang.get("questPartiesCreate").length() > 0) {
p.sendMessage(ChatColor.YELLOW + Lang.get("questPartiesCreate")); p.sendMessage(ChatColor.YELLOW + Lang.get("questPartiesCreate"));
} }
} }
} }
}
@EventHandler @EventHandler
public void onPartyDeleteEvent(BukkitPartiesPartyPostDeleteEvent event) { public void onPartyDeleteEvent(BukkitPartiesPartyPostDeleteEvent event) {
if (event.getCommandSender() != null) { if (event.getCommandSender() != null) {
Player p = Bukkit.getServer().getPlayer(event.getCommandSender().getPlayerUUID()); Player p = Bukkit.getServer().getPlayer(event.getCommandSender().getPlayerUUID());
if (p != null) { if (p != null) {
if (Lang.get("questPartiesDelete").length() > 0) {
p.sendMessage(ChatColor.RED + Lang.get("questPartiesDelete")); p.sendMessage(ChatColor.RED + Lang.get("questPartiesDelete"));
} }
} }
} }
}
@EventHandler @EventHandler
public void onPlayerJoinEvent(BukkitPartiesPlayerPostJoinEvent event) { public void onPlayerJoinEvent(BukkitPartiesPlayerPostJoinEvent event) {
if (event.isInvited() && event.getInviter() != null) { if (event.isInvited() && event.getInviter() != null) {
Player i = Bukkit.getServer().getPlayer(event.getInviter()); Player i = Bukkit.getServer().getPlayer(event.getInviter());
if (i != null) { if (i != null) {
if (Lang.get("questPartiesInvite").length() > 0) {
i.sendMessage(ChatColor.GREEN + Lang.get(i, "questPartiesInvite").replace("<player>", i.getName())); i.sendMessage(ChatColor.GREEN + Lang.get(i, "questPartiesInvite").replace("<player>", i.getName()));
} }
} }
}
Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID()); Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID());
if (p != null) { if (p != null) {
if (Lang.get("questPartiesJoin").length() > 0) {
p.sendMessage(ChatColor.GREEN + Lang.get(p, "questPartiesJoin").replace("<player>", p.getName())); p.sendMessage(ChatColor.GREEN + Lang.get(p, "questPartiesJoin").replace("<player>", p.getName()));
} }
} }
}
@EventHandler @EventHandler
public void onPlayerLeaveEvent(BukkitPartiesPlayerPostLeaveEvent event) { public void onPlayerLeaveEvent(BukkitPartiesPlayerPostLeaveEvent event) {
if (event.isKicked() && event.getKicker() != null) { if (event.isKicked() && event.getKicker() != null) {
Player k = Bukkit.getServer().getPlayer(event.getKicker().getPlayerUUID()); Player k = Bukkit.getServer().getPlayer(event.getKicker().getPlayerUUID());
if (k != null) { if (k != null) {
if (Lang.get("questPartiesKicked").length() > 0) {
k.sendMessage(ChatColor.RED + Lang.get(k, "questPartiesKicked").replace("<player>", k.getName())); k.sendMessage(ChatColor.RED + Lang.get(k, "questPartiesKicked").replace("<player>", k.getName()));
} }
} }
}
Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID()); Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID());
if (p != null) { if (p != null) {
if (Lang.get("questPartiesLeave").length() > 0) {
p.sendMessage(ChatColor.RED + Lang.get(p, "questPartiesLeave").replace("<player>", p.getName())); p.sendMessage(ChatColor.RED + Lang.get(p, "questPartiesLeave").replace("<player>", p.getName()));
} }
} }
}
} }