Skip to content

Commit

Permalink
I break things
Browse files Browse the repository at this point in the history
  • Loading branch information
mbax committed Mar 23, 2012
1 parent b241739 commit d68d64c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
7 changes: 5 additions & 2 deletions plugin.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: J2MC_ResSlots
main: to.joe.j2mc.resslots.J2MC_ReservedSlots
version: 0.0prealpha
version: 1.0
website: http://forums.joe.to
author: J2 Minecraft Plugin Team
description: Reserved slots module
description: Reserved slots module
permissions:
j2mc.resslots.resslot:
description: res slot holder
8 changes: 2 additions & 6 deletions src/to/joe/j2mc/resslots/J2MC_ReservedSlots.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import org.bukkit.event.player.PlayerLoginEvent.Result;
import org.bukkit.plugin.java.JavaPlugin;

import to.joe.j2mc.core.J2MC_Manager;

public class J2MC_ReservedSlots extends JavaPlugin implements Listener {

@Override
Expand All @@ -24,11 +22,9 @@ public void onEnable() {
}

@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerPreLogin(PlayerLoginEvent event) {
public void onPlayerLogin(PlayerLoginEvent event) {
if (this.getServer().getOnlinePlayers().length >= this.getServer().getMaxPlayers()) {
final boolean isAdmin = J2MC_Manager.getPermissions().isAdmin(event.getPlayer().getName());
final boolean isDonator = J2MC_Manager.getPermissions().hasFlag(event.getPlayer().getName(), 'd');
if (!isAdmin && !isDonator) {
if (!event.getPlayer().hasPermission("j2mc.resslots.resslot")) {
event.disallow(Result.KICK_FULL, ChatColor.RED + "Server full!" + ChatColor.WHITE + " For a reserved slot see donate.joe.to");
} else {
if (event.getResult() == Result.KICK_FULL) {
Expand Down

0 comments on commit d68d64c

Please sign in to comment.