Continue Dungeon class. Fixed issue #19.
This commit is contained in:
parent
163949e354
commit
66b18762e3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -23,3 +23,5 @@ commands:
|
|||||||
description: Unenchant your currently held item.
|
description: Unenchant your currently held item.
|
||||||
event:
|
event:
|
||||||
description: Toggles or untoggles events.
|
description: Toggles or untoggles events.
|
||||||
|
dungeon:
|
||||||
|
description: X
|
@ -190,6 +190,7 @@ public class Main extends JavaPlugin
|
|||||||
getCommand("settings").setExecutor(new commandBankEconomy(this));
|
getCommand("settings").setExecutor(new commandBankEconomy(this));
|
||||||
getCommand("maintenance").setExecutor(new commandBankEconomy(this));
|
getCommand("maintenance").setExecutor(new commandBankEconomy(this));
|
||||||
getCommand("event").setExecutor(new commandBankEconomy(this));
|
getCommand("event").setExecutor(new commandBankEconomy(this));
|
||||||
|
getCommand("dungeon").setExecutor(new commandBankEconomy(this));
|
||||||
|
|
||||||
setupEconomy();
|
setupEconomy();
|
||||||
|
|
||||||
@ -3153,9 +3154,14 @@ public void payDay(int time)
|
|||||||
p.sendMessage(ChatColor.GOLD+"Sorry, that is not a valid job!");
|
p.sendMessage(ChatColor.GOLD+"Sorry, that is not a valid job!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (PlayerinJob(p,job)) {
|
||||||
getAccountsConfig().set(p.getName()+".jobs.ultimate", String.valueOf(ValidJobs[matchedjob]));
|
getAccountsConfig().set(p.getName()+".jobs.ultimate", String.valueOf(ValidJobs[matchedjob]));
|
||||||
saveAccountsConfig();
|
saveAccountsConfig();
|
||||||
p.sendMessage(ChatColor.YELLOW+"Set Declared Ultimate job to "+job);
|
p.sendMessage(ChatColor.YELLOW+"Set Declared Ultimate job to "+job);
|
||||||
|
} else {
|
||||||
|
p.sendMessage(ChatColor.GOLD+"Sorry, you are not in that job!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean joinJob(Player p, String job) {
|
public boolean joinJob(Player p, String job) {
|
||||||
|
@ -1367,15 +1367,29 @@ public class PlayerListener
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPortalEnter(PlayerTeleportEvent e) {
|
public void onPortalEnter(PlayerTeleportEvent e) {
|
||||||
if (e.getPlayer().getLocation().distanceSquared(new Location(Bukkit.getWorld("world"),1606d,66d,-365d))<900) {
|
final Player p = e.getPlayer();
|
||||||
|
if (e.getFrom().getWorld()==Bukkit.getWorld("world")) {
|
||||||
|
if (e.getFrom().distanceSquared(new Location(Bukkit.getWorld("world"),1606d,66d,-365d))<900) {
|
||||||
//This is a player trying to enter a portal. Verify if they have selected their ultimate.
|
//This is a player trying to enter a portal. Verify if they have selected their ultimate.
|
||||||
if (this.plugin.getAccountsConfig().contains(e.getPlayer().getName()+".jobs.ultimate")) {
|
if (this.plugin.getAccountsConfig().contains(e.getPlayer().getName()+".jobs.ultimate")) {
|
||||||
//Check if this job's ultimate level is high enough.
|
//Check if this job's ultimate level is high enough.
|
||||||
if (this.plugin.getJobLv(this.plugin.getAccountsConfig().getString(e.getPlayer().getName()+".jobs.ultimate"), e.getPlayer())>=40) {
|
if (this.plugin.getJobLv(this.plugin.getAccountsConfig().getString(e.getPlayer().getName()+".jobs.ultimate"), e.getPlayer())>=40) {
|
||||||
//Allow this teleport.
|
//Allow this teleport.
|
||||||
e.setTo(new Location(Bukkit.getWorld("world"),-8990,68,-4));
|
//e.setTo(new Location(Bukkit.getWorld("world"),-8990,68,-4));
|
||||||
|
Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
p.getPlayer().teleport(new Location(Bukkit.getWorld("world"),-8990,68,-4));
|
||||||
|
}
|
||||||
|
},5);
|
||||||
} else {
|
} else {
|
||||||
e.setCancelled(true);
|
Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
p.getPlayer().teleport(new Location(Bukkit.getWorld("world"),1606d,66d,-365d));
|
||||||
|
}
|
||||||
|
},5);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2939,6 +2953,7 @@ public class PlayerListener
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (pot.getType()==PotionType.INSTANT_HEAL) {
|
if (pot.getType()==PotionType.INSTANT_HEAL) {
|
||||||
|
if (!p.isDead()) {
|
||||||
if (p.getHealth()+24>p.getMaxHealth()) {
|
if (p.getHealth()+24>p.getMaxHealth()) {
|
||||||
p.setHealth(p.getMaxHealth());
|
p.setHealth(p.getMaxHealth());
|
||||||
} else {
|
} else {
|
||||||
@ -2947,6 +2962,7 @@ public class PlayerListener
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPotionSplash(PotionSplashEvent e) {
|
public void onPotionSplash(PotionSplashEvent e) {
|
||||||
@ -2998,6 +3014,7 @@ public class PlayerListener
|
|||||||
this.plugin.gainMoneyExp(shooter,"Support",0.25,12);
|
this.plugin.gainMoneyExp(shooter,"Support",0.25,12);
|
||||||
}
|
}
|
||||||
if (nextpotioneffect.getType().getName().compareTo("HEAL")==0) {
|
if (nextpotioneffect.getType().getName().compareTo("HEAL")==0) {
|
||||||
|
if (!p.isDead()) {
|
||||||
if (p.getHealth()/p.getMaxHealth()<=0.30) {
|
if (p.getHealth()/p.getMaxHealth()<=0.30) {
|
||||||
this.plugin.gainMoneyExp(shooter,"Support",0.60,30);
|
this.plugin.gainMoneyExp(shooter,"Support",0.60,30);
|
||||||
//shooter.sendMessage("This is a big heal.");
|
//shooter.sendMessage("This is a big heal.");
|
||||||
@ -3011,6 +3028,7 @@ public class PlayerListener
|
|||||||
}
|
}
|
||||||
//shooter.sendMessage("This is a heal.");
|
//shooter.sendMessage("This is a heal.");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (nextpotioneffect.getType().getName().compareTo("REGENERATION")==0) {
|
if (nextpotioneffect.getType().getName().compareTo("REGENERATION")==0) {
|
||||||
if (p.getHealth()/p.getMaxHealth()<=0.30) {
|
if (p.getHealth()/p.getMaxHealth()<=0.30) {
|
||||||
this.plugin.gainMoneyExp(shooter,"Support",0.60,30);
|
this.plugin.gainMoneyExp(shooter,"Support",0.60,30);
|
||||||
@ -3082,6 +3100,7 @@ public class PlayerListener
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (nextpotioneffect.getType().getName().compareTo("HEAL")==0) {
|
if (nextpotioneffect.getType().getName().compareTo("HEAL")==0) {
|
||||||
|
if (!p.isDead()) {
|
||||||
if (p.getHealth()+12>p.getMaxHealth()) {
|
if (p.getHealth()+12>p.getMaxHealth()) {
|
||||||
p.setHealth(p.getMaxHealth());
|
p.setHealth(p.getMaxHealth());
|
||||||
} else {
|
} else {
|
||||||
@ -3091,6 +3110,7 @@ public class PlayerListener
|
|||||||
p.getScoreboard().getTeam(p.getName()).setSuffix(healthbar(p.getHealth(),p.getMaxHealth()));
|
p.getScoreboard().getTeam(p.getName()).setSuffix(healthbar(p.getHealth(),p.getMaxHealth()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} catch (ConcurrentModificationException ex_e) {
|
} catch (ConcurrentModificationException ex_e) {
|
||||||
Bukkit.getLogger().warning("Potion Effect Collection not accessible for a player while modifying speed amount.");
|
Bukkit.getLogger().warning("Potion Effect Collection not accessible for a player while modifying speed amount.");
|
||||||
}
|
}
|
||||||
@ -3131,6 +3151,7 @@ public class PlayerListener
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (nextpotioneffect.getType().getName().compareTo("HEAL")==0) {
|
if (nextpotioneffect.getType().getName().compareTo("HEAL")==0) {
|
||||||
|
if (!p.isDead()) {
|
||||||
if (p.getHealth()+12>p.getMaxHealth()) {
|
if (p.getHealth()+12>p.getMaxHealth()) {
|
||||||
p.setHealth(p.getMaxHealth());
|
p.setHealth(p.getMaxHealth());
|
||||||
} else {
|
} else {
|
||||||
@ -3138,6 +3159,7 @@ public class PlayerListener
|
|||||||
}
|
}
|
||||||
//shooter.sendMessage("This is a heal.");
|
//shooter.sendMessage("This is a heal.");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
effects.remove();
|
effects.remove();
|
||||||
}
|
}
|
||||||
} catch (ConcurrentModificationException ex_e) {
|
} catch (ConcurrentModificationException ex_e) {
|
||||||
|
@ -5,11 +5,13 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import me.kaZep.Base.Dungeon;
|
||||||
import me.kaZep.Base.Main;
|
import me.kaZep.Base.Main;
|
||||||
import net.milkbowl.vault.economy.Economy;
|
import net.milkbowl.vault.economy.Economy;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.OfflinePlayer;
|
import org.bukkit.OfflinePlayer;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
@ -264,6 +266,9 @@ public class commandBankEconomy
|
|||||||
}
|
}
|
||||||
this.plugin.saveConfig();
|
this.plugin.saveConfig();
|
||||||
}
|
}
|
||||||
|
} else
|
||||||
|
if (cmd.getName().equalsIgnoreCase("dungeon") && p.hasPermission("maintenance-mode-admin") && args.length==1) {
|
||||||
|
Dungeon x = new Dungeon(new Location(Bukkit.getWorld("world"),-8990,0,-4),new Location(Bukkit.getWorld("world"),50,255,50),Integer.valueOf(args[0]));
|
||||||
} else
|
} else
|
||||||
if (cmd.getName().equalsIgnoreCase("transfer") && args.length==1) {
|
if (cmd.getName().equalsIgnoreCase("transfer") && args.length==1) {
|
||||||
p.sendMessage("Usage: "+ChatColor.RED+"/transfer name money"+ChatColor.WHITE+" - Transfer money to a player.");
|
p.sendMessage("Usage: "+ChatColor.RED+"/transfer name money"+ChatColor.WHITE+" - Transfer money to a player.");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user