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

gestion plus propre des grades dans le plugin

Browse Source
This commit is contained in:
Marc Baloup
2015-02-05 02:23:27 -05:00
parent 1a8a911a12
commit 9a45dbf44b
16 changed files with 101 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/AfkManager.java
View File

@@ -53,7 +53,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
@Override
public void run() {
// methode exécutée toute les secondes
Collection<OnlinePlayer> oPlayers = OnlinePlayerManager.getInstance().getAll();
Collection<OnlinePlayer> oPlayers = OnlinePlayerManager.getAll();
for (OnlinePlayer ap : oPlayers.toArray(new OnlinePlayer[oPlayers.size()]))
{ // parcours de tout les joueurs
if (ap == null)
@@ -97,7 +97,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
if ( (from.getPitch() == to.getPitch() && from.getYaw() == to.getYaw())
|| (from.getX() == to.getX() && from.getY() == to.getY() && from.getZ() == to.getZ()))
return;
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
@@ -127,7 +127,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
return;
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
@EventHandler
@@ -135,7 +135,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
{
try
{
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}
@@ -145,7 +145,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
{
try
{
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}
@@ -160,7 +160,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
// car un piston "téléporte" le joueur (techniquement parlant, dans le jeu) à 1 bloc de distance
if (event.getFrom().getWorld() != event.getTo().getWorld()
|| event.getFrom().distanceSquared(event.getTo()) > 2*2)
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}
@@ -170,7 +170,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
{
try
{
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}
@@ -179,7 +179,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
{
try
{
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}
@@ -188,7 +188,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
{
try
{
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}
@@ -198,7 +198,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
{
try
{
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}
@@ -208,7 +208,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
{
try
{
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}
@@ -218,7 +218,7 @@ public class AfkManager extends BukkitRunnable implements Listener {
{
try
{
OnlinePlayerManager.getInstance().get(event.getPlayer()).isDoingAction();
OnlinePlayerManager.get(event.getPlayer()).isDoingAction();
}
catch (NullPointerException e) { }
}

4
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/AutoMessagesManager.java
View File

@@ -37,12 +37,12 @@ public class AutoMessagesManager extends BukkitRunnable {
// message
// permissions
Collection<OnlinePlayer> oPlayers = OnlinePlayerManager.getInstance().getAll();
Collection<OnlinePlayer> oPlayers = OnlinePlayerManager.getAll();
for (OnlinePlayer op : oPlayers) {
int interval_sec = op.getPlayer().hasPermission("pandacraft.grade.default") ? interval_default : interval_players;
int interval_sec = op.isGuest() ? interval_default : interval_players;
op.firstAutomessageCkeck(interval_sec);

2
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/CalculatorManager.java
View File

@@ -34,7 +34,7 @@ public class CalculatorManager implements Listener {
if (!message.startsWith("="))
return;
OnlinePlayer op = OnlinePlayerManager.getInstance().get(event.getPlayer());
OnlinePlayer op = OnlinePlayerManager.get(event.getPlayer());
List<HistoryElement> history = op.getCalculator_history();
if (message.length() == 1)

4
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/ChatAnalysisManager.java
View File

@@ -27,7 +27,7 @@ public class ChatAnalysisManager implements Listener {
public void onAsyncPlayerChat(AsyncPlayerChatEvent event)
{
try {
OnlinePlayer op = OnlinePlayerManager.getInstance().get(event.getPlayer());
OnlinePlayer op = OnlinePlayerManager.get(event.getPlayer());
if (event.getPlayer().hasPermission("pandacraft.antispam.exempt"))
return;
String message = event.getMessage();
@@ -75,7 +75,7 @@ public class ChatAnalysisManager implements Listener {
public void onPlayerCommandPreprocess (PlayerCommandPreprocessEvent event)
{
try {
OnlinePlayer op = OnlinePlayerManager.getInstance().get(event.getPlayer());
OnlinePlayer op = OnlinePlayerManager.get(event.getPlayer());
if (event.getPlayer().hasPermission("pandacraft.antispam.exempt"))
return;
String command_line = event.getMessage();

20
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/PacketOutServerInfoListener.java
View File

@@ -16,6 +16,8 @@ import com.comphenix.protocol.wrappers.WrappedGameProfile;
import net.mc_pandacraft.java.plugin.pandacraftutils.ConfigManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayer;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
import net.mc_pandacraft.java.plugin.pandacraftutils.plugin_interface.EssentialsInterface;
public class PacketOutServerInfoListener {
@@ -43,7 +45,7 @@ public class PacketOutServerInfoListener {
List<Player> plAdmin = new ArrayList<Player>();
List<Player> plModo = new ArrayList<Player>();
List<Player> plStaff = new ArrayList<Player>();
List<Player> plPlayerUltimate = new ArrayList<Player>();
List<Player> plPlayerPremium = new ArrayList<Player>();
List<Player> plPlayer = new ArrayList<Player>();
@@ -55,13 +57,15 @@ public class PacketOutServerInfoListener {
// on passe si le joueur est vanish
if(EssentialsInterface.isPlayerVanished(p)) continue;
if (p.hasPermission("pandacraft.grade.admins"))
OnlinePlayer op = OnlinePlayerManager.get(p);
if (op.isInGroup("admins"))
plAdmin.add(p);
else if (p.hasPermission("pandacraft.grade.modos"))
plModo.add(p);
else if (p.hasPermission("pandacraft.grade.ultimate"))
else if (op.isInStaff())
plStaff.add(p);
else if (op.isInGroup("ultimate"))
plPlayerUltimate.add(p);
else if (p.hasPermission("pandacraft.grade.premium"))
else if (op.isInGroup("premium"))
plPlayerPremium.add(p);
else
plPlayer.add(p);
@@ -73,14 +77,14 @@ public class PacketOutServerInfoListener {
List<WrappedGameProfile> list = new ArrayList<WrappedGameProfile>();
if (!plAdmin.isEmpty() || !plModo.isEmpty())
if (!plAdmin.isEmpty() || !plStaff.isEmpty())
{
list.add(new WrappedGameProfile("", "§cStaff connecté :"));
for (Player p : plAdmin)
{
list.add(new WrappedGameProfile("", "§7 - "+p.getDisplayName()));
}
for (Player p : plModo)
for (Player p : plStaff)
{
list.add(new WrappedGameProfile("", "§7 - "+p.getDisplayName()));
}

3
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/StaffQueueManager.java
View File

@@ -6,6 +6,7 @@ import java.util.LinkedList;
import java.util.Queue;
import net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils;
import net.mc_pandacraft.java.plugin.pandacraftutils.players.OnlinePlayerManager;
import net.mc_pandacraft.java.util.ScoreBoardUtil;
import net.mc_pandacraft.java.util.TimeUtil;
@@ -191,7 +192,7 @@ public class StaffQueueManager implements Listener {
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
Player p = event.getPlayer();
if (p.hasPermission("pandacraft.grade.staff"))
if (OnlinePlayerManager.get(p).isInStaff())
p.setScoreboard(scoreboardPlayerQueue);
plugin.getServer().getScheduler().runTaskLater(plugin, new Runnable() {
@Override public void run() { updateScoreBoardWaitingList(); }

2
src/net/mc_pandacraft/java/plugin/pandacraftutils/modules/WESelectionDisplayManager.java
View File

@@ -36,7 +36,7 @@ public class WESelectionDisplayManager extends BukkitRunnable {
try
{
for (OnlinePlayer op : OnlinePlayerManager.getInstance().getAll())
for (OnlinePlayer op : OnlinePlayerManager.getAll())
{
Player p = op.getPlayer();
// on vérifie que le joueur soit en ligne