PandacubeFr/PandacraftUtils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Intégration et gestion des mute et des vanish dans le plugin

Browse Source
This commit is contained in:
Marc Baloup 2015-01-02 18:41:30 -05:00
parent 9b77a5f8dd
commit 6b559f69c6
9 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -9,5 +9,6 @@
<classpathentry kind="lib" path="lib/WorldEdit-5.6.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/PandacraftAuth.jar" sourcepath="R:/Dropbox/wspace_java_minecraft/xAuth.src"/>
<classpathentry kind="lib" path="lib/Essentials-Pre2.13.1.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

BIN
lib/Essentials-Pre2.13.1.2.jar Normal file
View File

Binary file not shown.

2
make_jar.jardesc
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<jardesc>
<jar path="PandacraftUtils/jar_export/PandacraftUtils-2.6.jar"/>
<jar path="PandacraftUtils/jar_export/PandacraftUtils-2.7.jar"/>
<options buildIfNeeded="true" compress="true" descriptionLocation="/PandacraftUtils/make_jar.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
<selectedProjects/>

2
resources/plugin.yml
View File

@ -1,6 +1,6 @@
name: PandacraftUtils
main: net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils
version: 2.6
version: 2.7

9
src/net/mc_pandacraft/java/plugin/pandacraftutils/afk/AfkPlayer.java
View File

@ -1,7 +1,11 @@
package net.mc_pandacraft.java.plugin.pandacraftutils.afk;
import net.mc_pandacraft.java.plugin.pandacraftutils.plugin_interface.EssentialsInterface;
import org.bukkit.entity.Player;
import com.earth2me.essentials.Essentials;
public class AfkPlayer {
private Player player;
private long timeLastAction;
@ -26,6 +30,11 @@ public class AfkPlayer {
return;
afk = a;
String message;
// on affiche pas le status AFK des joueurs vanish
if (EssentialsInterface.isPlayerVanished(player)) return;
// affichage du message
if (afk)
message = player.getDisplayName()+"§r est désormais AFK.";
else

13
src/net/mc_pandacraft/java/plugin/pandacraftutils/login_message/LoginLogoutManager.java
View File

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.List;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.plugin_interface.EssentialsInterface;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
@ -37,8 +38,11 @@ public class LoginLogoutManager implements Listener {
@EventHandler
public void onxAuthLogin(xAuthLoginEvent event) {
plugin.getServer().broadcastMessage(ChatColor.YELLOW+event.getPlayer().getDisplayName()+ChatColor.YELLOW+" vient de se connecter");
loggedInPlayer.add(event.getPlayer());
if (EssentialsInterface.isPlayerVanished(event.getPlayer())) return;
plugin.getServer().broadcastMessage(ChatColor.YELLOW+event.getPlayer().getDisplayName()+ChatColor.YELLOW+" vient de se connecter");
}
@EventHandler
@ -47,11 +51,18 @@ public class LoginLogoutManager implements Listener {
if (!isPlayerLoggedIn(event.getPlayer()))
return;
loggedInPlayer.remove(event.getPlayer());
// on affiche le message que si le joueur n'est pas vanish
if (EssentialsInterface.isPlayerVanished(event.getPlayer())) return;
plugin.getServer().broadcastMessage(ChatColor.YELLOW+event.getPlayer().getDisplayName()+ChatColor.YELLOW+" a quitté le jeu");
}
public List<Player> getLoggedInPlayers() { return loggedInPlayer; }
public List<Player> getLoggedOutPlayers() {

9
src/net/mc_pandacraft/java/plugin/pandacraftutils/player_count_list/PacketOutServerInfoListener.java
View File

@ -15,6 +15,7 @@ import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.WrappedGameProfile;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.plugin_interface.EssentialsInterface;
public class PacketOutServerInfoListener {
private PandacraftUtils plugin;
@ -38,6 +39,8 @@ public class PacketOutServerInfoListener {
{
Player[] pl_list = PacketOutServerInfoListener.this.plugin.getServer().getOnlinePlayers();
int count_player = 0;
List<Player> plAdmin = new ArrayList<Player>();
List<Player> plModo = new ArrayList<Player>();
@ -49,6 +52,9 @@ public class PacketOutServerInfoListener {
{
if (p != null && p.isOnline())
{
// on passe si le joueur est vanish
if(EssentialsInterface.isPlayerVanished(p)) continue;
if (p.hasPermission("pandacraft.grade.admins"))
plAdmin.add(p);
else if (p.hasPermission("pandacraft.grade.modos"))
@ -59,6 +65,8 @@ public class PacketOutServerInfoListener {
plPlayerPremium.add(p);
else
plPlayer.add(p);
count_player++;
}
}
@ -97,6 +105,7 @@ public class PacketOutServerInfoListener {
event.getPacket().getServerPings().read(0).setPlayers(list);
event.getPacket().getServerPings().read(0).setPlayersOnline(count_player);
}
}
);

37
src/net/mc_pandacraft/java/plugin/pandacraftutils/plugin_interface/EssentialsInterface.java Normal file
View File

@ -0,0 +1,37 @@
package net.mc_pandacraft.java.plugin.pandacraftutils.plugin_interface;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import org.bukkit.entity.Player;
import com.earth2me.essentials.Essentials;
public class EssentialsInterface {
public static boolean isPlayerVanished(Player p) {
try {
return ((Essentials)PandacraftUtils.getInstance().getServer().getPluginManager().getPlugin("Essentials")).getUser(p).isVanished();
} catch (Exception e) { }
return false;
}
public static boolean canPlayerSeeVanishedPlayer(Player p, Player hiddenP) {
try {
Essentials ess = (Essentials)PandacraftUtils.getInstance().getServer().getPluginManager().getPlugin("Essentials");
return ess.getUser(p).canSee(hiddenP);
} catch (Exception e) { }
return false;
}
public static boolean isPlayerMuted(Player p) {
try {
return ((Essentials)PandacraftUtils.getInstance().getServer().getPluginManager().getPlugin("Essentials")).getUser(p).isMuted();
} catch (Exception e) { }
return false;
}
}

7
src/net/mc_pandacraft/java/plugin/pandacraftutils/simple_commands/me/CommandMe.java
View File

@ -1,6 +1,7 @@
package net.mc_pandacraft.java.plugin.pandacraftutils.simple_commands.me;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.plugin_interface.EssentialsInterface;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
@ -24,9 +25,15 @@ public class CommandMe implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (args.length == 0) return false;
String name;
if (sender instanceof Player)
{
// pas de /me pour les mute
if (EssentialsInterface.isPlayerMuted((Player)sender)) return true;
name = ((Player)sender).getDisplayName()+ChatColor.RESET+" "+ChatColor.ITALIC;
}
else if (sender instanceof ConsoleCommandSender
|| sender instanceof RemoteConsoleCommandSender)
name = ChatColor.ITALIC+"Le serveur ";