Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-08 11:59:43 +01:00
Code Issues Projects Releases Wiki Activity

Make send- and receive- chat flags respect group flags.

Browse Source
This commit is contained in:
wizjany 2018-02-24 09:39:16 -05:00
parent 3a332fd87d
commit d2c52f7c1b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java
View File

@ -153,14 +153,16 @@ public void onPlayerChat(AsyncPlayerChatEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld()); WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld());
if (wcfg.useRegions) { if (wcfg.useRegions) {
if (!plugin.getGlobalRegionManager().allows(DefaultFlag.SEND_CHAT, player.getLocation())) { LocalPlayer localPlayer = plugin.wrapPlayer(player);
if (!plugin.getGlobalRegionManager().allows(DefaultFlag.SEND_CHAT, player.getLocation(), localPlayer)) {
player.sendMessage(ChatColor.RED + "You don't have permission to chat in this region!"); player.sendMessage(ChatColor.RED + "You don't have permission to chat in this region!");
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
for (Iterator<Player> i = event.getRecipients().iterator(); i.hasNext();) { for (Iterator<Player> i = event.getRecipients().iterator(); i.hasNext();) {
if (!plugin.getGlobalRegionManager().allows(DefaultFlag.RECEIVE_CHAT, i.next().getLocation())) { Player rPlayer = i.next();
if (!plugin.getGlobalRegionManager().allows(DefaultFlag.RECEIVE_CHAT, rPlayer.getLocation(), plugin.wrapPlayer(rPlayer))) {
i.remove(); i.remove();
} }
} }