Change some stuff.

This commit is contained in:
YoshiGenius
2012-07-17 14:47:12 +10:00
parent f2d2d634a3
commit 7649fc4682
61 changed files with 206 additions and 16 deletions

View File

@@ -30,6 +30,7 @@ public class DeathListener implements Listener{
}
}
@EventHandler
@SuppressWarnings("SizeReplaceableByIsEmpty")
public void onPlayerDeath(PlayerDeathEvent event){
Player p = event.getEntity();
Server s = p.getServer();
@@ -110,7 +111,7 @@ public class DeathListener implements Listener{
winner.getInventory().addItem(plugin.Reward);
plugin.Playing.clear();
//Show spectators
if(!plugin.Watching.isEmpty()){
if(plugin.Watching.size() != 0){
String s1 = plugin.Watching.get(i++);
Player spectator = plugin.getServer().getPlayerExact(s1);
spectator.setAllowFlight(false);

View File

@@ -0,0 +1,32 @@
package me.travja.hungerarena;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageEvent;
/**
*
* @author YoshiGenius
*/
public class DmgListener implements Listener {
public Main plugin;
public DmgListener(Main m) {
this.plugin = m;
}
@EventHandler
public void onDmg(EntityDamageEvent evt) {
Entity e = evt.getEntity();
if (e instanceof Player) {
Player p = (Player) e;
String pn = p.getName();
if (plugin.Frozen.contains(pn)) {
evt.setCancelled(true);
}
}
}
}

View File

@@ -1,9 +1,11 @@
package me.travja.hungerarena;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
public class FreezeListener implements Listener {
public Main plugin;
@@ -15,7 +17,8 @@ public class FreezeListener implements Listener {
Player p = event.getPlayer();
String pname = p.getName();
if(plugin.Frozen.contains(pname) && plugin.config.getString("Frozen_Teleport").equalsIgnoreCase("True")){
event.setCancelled(true);
Location from = event.getFrom();
p.teleport(from, TeleportCause.ENDER_PEARL);
}
}
}

View File

@@ -13,9 +13,19 @@ import org.bukkit.event.player.PlayerQuitEvent;
public class JoinAndQuitListener implements Listener {
public Main plugin;
public JoinAndQuitListener(Main m) {
this.plugin = m;
this.plugin = m;
}
int i = 0;
@EventHandler
public void onJoin(PlayerJoinEvent evt) {
Player p = evt.getPlayer();
for (String s : plugin.Watching) {
Player spectator = Bukkit.getServer().getPlayerExact(s);
p.hidePlayer(spectator);
}
}
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event){
final Player p = event.getPlayer();
@@ -50,6 +60,24 @@ public class JoinAndQuitListener implements Listener {
}, 40L);
}
}
@EventHandler
public void onQuit(PlayerQuitEvent evt) {
Player p = evt.getPlayer();
String pname = p.getName();
if (plugin.Frozen.contains(pname)) {
plugin.Frozen.remove(pname);
String[] Spawncoords = plugin.config.getString("Spawn_coords").split(",");
String w = Spawncoords[3];
World spawnw = plugin.getServer().getWorld(w);
double spawnx = Double.parseDouble(Spawncoords[0]);
double spawny = Double.parseDouble(Spawncoords[1]);
double spawnz = Double.parseDouble(Spawncoords[2]);
Location Spawn = new Location(spawnw, spawnx, spawny, spawnz);
p.teleport(Spawn);
}
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event){
final Player p = event.getPlayer();
@@ -102,7 +130,6 @@ public class JoinAndQuitListener implements Listener {
}
}else{
plugin.Quit.add(pname);
plugin.Out.remove(pname);
}
}
}, 1200L);

View File

@@ -31,6 +31,8 @@ public class Main extends JavaPlugin{
public Listener PvP = new PvP(this);
public Listener Blocks = new Blocks(this);
public Listener CommandBlock = new CommandBlock(this);
public Listener Damage = new DmgListener(this);
public Listener Teleport = new TeleportListener(this);
public Listener Signs = new Signs(this);
public Listener BlockStorage = new BlockStorage(this);
public Listener WinGames = new WinGamesListener(this);
@@ -60,6 +62,7 @@ public class Main extends JavaPlugin{
getServer().getPluginManager().registerEvents(Signs, this);
getServer().getPluginManager().registerEvents(BlockStorage, this);
getServer().getPluginManager().registerEvents(WinGames, this);
getServer().getPluginManager().registerEvents(Damage, this);
getCommand("Ha").setExecutor(HaCommands);
getCommand("Sponsor").setExecutor(SponsorCommands);
getCommand("Startpoint").setExecutor(SpawnsCommand);

View File

@@ -19,28 +19,33 @@ public class Signs implements Listener {
public void Sign(PlayerInteractEvent event){
Player p = event.getPlayer();
Block b = event.getClickedBlock();
if (b == null) {
return;
}
if(event.getAction()== Action.RIGHT_CLICK_BLOCK){
if(b.getType()== Material.SIGN || b.getType()==Material.SIGN_POST || b.getType()==Material.WALL_SIGN){
org.bukkit.block.Sign sign = (org.bukkit.block.Sign) b.getState();
String[] lines = sign.getLines();
if(lines[0].equalsIgnoreCase(ChatColor.BLUE + "[HungerArena]")){
if(lines[1].isEmpty()){
String line1 = sign.getLine(0);
String line2 = sign.getLine(1);
String line3 = sign.getLine(2);
String line4 = sign.getLine(3);
if(line1.equalsIgnoreCase(ChatColor.BLUE + "[HungerArena]") || line1.equalsIgnoreCase(ChatColor.BLUE + "[HA]")){
if(line2.equals("")){
p.performCommand("ha");
}else{
p.performCommand("ha " + lines[1]);
p.performCommand("ha " + line2);
}
}
if(lines[0].equalsIgnoreCase(ChatColor.BLUE + "[Sponsor]")){
p.performCommand("sponsor " + lines[1] + " " + lines[2] + " " + lines[3]);
if(line1.equalsIgnoreCase(ChatColor.BLUE + "[Sponsor]")){
p.performCommand("sponsor " + line2 + " " + line3 + " " + line4);
}
}
}
}
@EventHandler
public void Create(SignChangeEvent event){
String[] lines = event.getLines();
String top = lines[0];
if(top.equalsIgnoreCase("[HungerArena]") || top.equalsIgnoreCase("[Sponsor]")){
String top = event.getLine(0);
if(top.equalsIgnoreCase("[HungerArena]") || top.equalsIgnoreCase("[HA]") || top.equalsIgnoreCase("[Sponsor]")){
event.setLine(0, ChatColor.BLUE + top);
}
}

View File

@@ -118,8 +118,8 @@ public class SpectatorListener implements Listener {
@EventHandler
public void MobNerf(EntityTargetEvent event){
Entity target = event.getTarget();
Entity le = event.getEntity();
if (le instanceof Player) {
Entity e = event.getEntity();
if (e instanceof Player) {
return;
}
if(target instanceof Player){

View File

@@ -0,0 +1,36 @@
package me.travja.hungerarena;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
/**
*
* @author YoshiGenius
*/
public class TeleportListener implements Listener {
public Main plugin;
public TeleportListener(Main m) {
this.plugin = m;
}
@EventHandler
public void onTP(PlayerTeleportEvent evt) {
Player p = evt.getPlayer();
TeleportCause tc = evt.getCause();
if (tc == TeleportCause.ENDER_PEARL) {
return;
}
if (tc == TeleportCause.END_PORTAL) {
return;
}
if (tc == TeleportCause.NETHER_PORTAL) {
return;
}
evt.setCancelled(true);
}
}