diff --git a/.gitignore b/.gitignore index c2e787c..43b83a9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ doc/* bin/ .classpath -.project \ No newline at end of file +.project +target diff --git a/pom.xml b/pom.xml index ba26a0a..f380eef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ tk.yoshicraft.plugindev.jail Jail - 0.1 + 2.2.0-pre3 jar Jail @@ -13,6 +13,17 @@ UTF-8 + + + + bukkit-repo + http://repo.bukkit.org/content/groups/public + + + spout-repo + http://nexus.spout.org/content/groups/public/ + + @@ -24,22 +35,22 @@ org.bukkit bukkit - 1.2.3-R0.2 + 1.3.1-R1.0 - org.spout - spoutapi - 1.2.3-1 + org.getspout + spoutpluginapi + dev-SNAPSHOT net.milkbowl vault - 1.2.3-1 + 1.2.17-SNAPSHOT com.sk89q worldedit - 5.3-SNAPSHOT + 5.4-SNAPSHOT diff --git a/src/main/java/com/matejdro/bukkit/jail/listeners/JailPlayerListener.java b/src/main/java/com/matejdro/bukkit/jail/listeners/JailPlayerListener.java index 51eb79f..3f5b772 100644 --- a/src/main/java/com/matejdro/bukkit/jail/listeners/JailPlayerListener.java +++ b/src/main/java/com/matejdro/bukkit/jail/listeners/JailPlayerListener.java @@ -3,9 +3,9 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; +import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerAnimationEvent; import org.bukkit.event.player.PlayerAnimationType; -import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; @@ -56,7 +56,7 @@ public void onPlayerAnimation(PlayerAnimationEvent event) { } @EventHandler() - public void onPlayerChat(PlayerChatEvent event) { + public void onPlayerChat(AsyncPlayerChatEvent event) { if (event.isCancelled()) return; if ( JailCellCreation.players.containsKey(event.getPlayer().getName())) { diff --git a/src/main/java/com/matejdro/bukkit/jail/listeners/JailPlayerProtectionListener.java b/src/main/java/com/matejdro/bukkit/jail/listeners/JailPlayerProtectionListener.java index 4c9c9c5..51b2e2d 100644 --- a/src/main/java/com/matejdro/bukkit/jail/listeners/JailPlayerProtectionListener.java +++ b/src/main/java/com/matejdro/bukkit/jail/listeners/JailPlayerProtectionListener.java @@ -10,7 +10,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; -import org.bukkit.event.player.PlayerChatEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerMoveEvent; @@ -35,7 +35,7 @@ public JailPlayerProtectionListener(Jail instance) } @EventHandler() - public void onPlayerChat (PlayerChatEvent event) + public void onPlayerChat (AsyncPlayerChatEvent event) { if (event.isCancelled()) return; JailPrisoner prisoner = Jail.prisoners.get(event.getPlayer().getName().toLowerCase()); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 2b4eab5..78ca532 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Jail main: com.matejdro.bukkit.jail.Jail -version: 2.2.0-pre2 +version: 2.2.0-pre3 description: Ban too harsh? Kick/mute/whatever not enough? Jail bad players! author: matejdro website: dev.bukkit.org/server-mods/jail/