SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for remaining old PlayerChatEvents, update EssentialsChat libs and integration accordingly

Browse Source
This commit is contained in:
Brettflan 2012-08-07 21:51:31 -05:00
parent 5a558a2f0f
commit 6059ee0b0b
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/Essentials.jar
View File

Binary file not shown.

BIN
lib/EssentialsChat_2.8.1.jar
View File

Binary file not shown.

BIN
lib/EssentialsChat_2.x.jar Normal file
View File

Binary file not shown.

0
lib/EssentialsChat.jar → lib/EssentialsChat_3_dev.jar
View File

5
src/com/massivecraft/factions/P.java
View File

@ -11,7 +11,7 @@ import org.bukkit.block.Block;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -221,8 +221,7 @@ public class P extends MPlugin
// Simply put, should this chat event be left for Factions to handle? For now, that means players with Faction Chat // Simply put, should this chat event be left for Factions to handle? For now, that means players with Faction Chat
// enabled or use of the Factions f command without a slash; combination of isPlayerFactionChatting() and isFactionsCommand() // enabled or use of the Factions f command without a slash; combination of isPlayerFactionChatting() and isFactionsCommand()
public boolean shouldLetFactionsHandleThisChat(AsyncPlayerChatEvent event)
public boolean shouldLetFactionsHandleThisChat(PlayerChatEvent event)
{ {
if (event == null) return false; if (event == null) return false;
return (isPlayerFactionChatting(event.getPlayer()) || isFactionsCommand(event.getMessage())); return (isPlayerFactionChatting(event.getPlayer()) || isFactionsCommand(event.getMessage()));

6
src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.factions.integration; package com.massivecraft.factions.integration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.AsyncPlayerChatEvent;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
@ -25,11 +25,11 @@ public class EssentialsOldVersionFeatures
{ {
essChat.addEssentialsChatListener("Factions", new IEssentialsChatListener() essChat.addEssentialsChatListener("Factions", new IEssentialsChatListener()
{ {
public boolean shouldHandleThisChat(PlayerChatEvent event) public boolean shouldHandleThisChat(AsyncPlayerChatEvent event)
{ {
return P.p.shouldLetFactionsHandleThisChat(event); return P.p.shouldLetFactionsHandleThisChat(event);
} }
public String modifyMessage(PlayerChatEvent event, Player target, String message) public String modifyMessage(AsyncPlayerChatEvent event, Player target, String message)
{ {
return message.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(event.getPlayer())); return message.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(event.getPlayer()));
} }