diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..ab7f84c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1325 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GamePlayer
+ gaMap
+ golem
+ witch
+ .spawn(
+ "S"
+ "U"
+ "
+ getGolem
+ Golem
+ sec
+ *
+ getTeam
+ getScoreboardManager
+ �
+ DyeColor
+ getPitch
+ getMode
+ TeamsInfos.getTeamInfosByID(i).getTeamName()
+ getLocation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ C:\Users\asus\AppData\Roaming\Subversion
+
+
+
+
+ 1536599327798
+
+
+ 1536599327798
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1536602827991
+
+
+
+ 1536602827991
+
+
+ 1536603382061
+
+
+
+ 1536603382061
+
+
+ 1536858472902
+
+
+
+ 1536858472905
+
+
+ 1536864825337
+
+
+
+ 1536864825337
+
+
+ 1536864899849
+
+
+
+ 1536864899849
+
+
+ 1536932598279
+
+
+
+ 1536932598279
+
+
+ 1536936052090
+
+
+
+ 1536936052090
+
+
+ 1536956491175
+
+
+
+ 1536956491175
+
+
+ 1536959563910
+
+
+
+ 1536959563911
+
+
+ 1537115275446
+
+
+
+ 1537115275446
+
+
+ 1537381607495
+
+
+
+ 1537381607495
+
+
+ 1537616213718
+
+
+
+ 1537616213718
+
+
+ 1537639987818
+
+
+
+ 1537639987819
+
+
+ 1537649122548
+
+
+
+ 1537649122548
+
+
+ 1537652657813
+
+
+
+ 1537652657813
+
+
+ 1538309585037
+
+
+
+ 1538309585037
+
+
+ 1538309875787
+
+
+
+ 1538309875802
+
+
+ 1539279552744
+
+
+
+ 1539279552744
+
+
+ 1539453143774
+
+
+
+ 1539453143780
+
+
+ 1539538388057
+
+
+
+ 1539538388062
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Minecraft (WitchRush_main)|Minecraft
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.8-161
+
+
+
+
+
+
+
+ WitchRush|WitchRush
+
+
+
+
+
+
+
+ 1.8-161
+
+
+
+
+
+
+
+ Gradle: junit:junit:4.12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/WitchPlayer.java b/WitchRush/src/main/java/net/berrygames/witchrush/WitchPlayer.java
index bf99abc..aa45f2a 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/WitchPlayer.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/WitchPlayer.java
@@ -3,7 +3,9 @@ package net.berrygames.witchrush;
import net.berrygames.witchrush.game.GameState;
import net.berrygames.witchrush.kits.Kits;
import net.berrygames.witchrush.team.TeamManager;
+import net.berrygames.witchrush.team.TeamsInfos;
import net.berrygames.witchrush.tools.ItemFactory;
+import net.berrygames.witchrush.tools.Locations;
import org.bukkit.Color;
import org.bukkit.DyeColor;
import org.bukkit.Material;
@@ -23,17 +25,33 @@ public class WitchPlayer {
private boolean spectator;
private int kills, death;
private TeamManager manager;
+ private TeamsInfos team;
public WitchPlayer(Player player) {
this.player = player;
this.spectator = GameState.getStatus().equals(GameState.GAME) ? true: false;
this.kills = 0;
this.death = 0;
+ this.team = WitchRush.get().getTeamManager().getPlayerTeam(player);
this.manager = WitchRush.get().getTeamManager();
}
public void teleportToBase(){
- player.teleport(manager.getTeamLocation(manager.getPlayerTeam(player)));
+ switch (manager.getPlayerTeam(player)){
+ case ROUGE:
+ player.teleport(Locations.SPAWN_ROUGE.getLoc());
+ break;
+ case VERT:
+ player.teleport(Locations.SPAWN_VERT.getLoc());
+ break;
+ case JAUNE:
+ player.teleport(Locations.SPAWN_JAUNE.getLoc());
+ break;
+ case BLEU:
+ player.teleport(Locations.SPAWN_BLEU.getLoc());
+ break;
+ }
+
}
public void giveStuff(){
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/WitchRush.java b/WitchRush/src/main/java/net/berrygames/witchrush/WitchRush.java
index fcf7287..c796048 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/WitchRush.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/WitchRush.java
@@ -22,8 +22,6 @@ public class WitchRush extends JavaPlugin {
private TeamManager teamManager;
private boolean forcedStart;
- private File file;
- private FileConfiguration conf;
@Override
public void onEnable() {
@@ -36,10 +34,6 @@ public class WitchRush extends JavaPlugin {
new CommandsManager().register(this);
new ListenersManager().register(this);
- saveDefaultConfig();
-
- this.createYML(getConfig().getString("game.mode"));
-
System.out.println("*-*-*-*-*-*-*-*");
System.out.println("WitchRush");
System.out.println("by BunS");
@@ -49,34 +43,6 @@ public class WitchRush extends JavaPlugin {
super.onEnable();
}
- private void createYML(String name) {
- this.file = new File(getDataFolder(), name+".yml");
- if (!file.exists()) {
- file.getParentFile().mkdirs();
- saveResource(name+".yml", false);
- }
-
- this.conf = new YamlConfiguration();
- try {
- conf.load(file);
- } catch (IOException | InvalidConfigurationException e) {
- e.printStackTrace();
- }
- }
-
- public void setConf(String path, Object value){
- this.conf.set(path, value);
- try {
- this.conf.save(this.file);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public FileConfiguration getConf(){
- return conf;
- }
-
@Override
public void onDisable() {
System.out.println("*-*-*-*-*-*-*-*");
@@ -90,11 +56,6 @@ public class WitchRush extends JavaPlugin {
Bukkit.getWorld("world").getEntities().forEach(en -> en.remove());
}
- @Override
- public File getFile() {
- return file;
- }
-
public TeamManager getTeamManager() {
return teamManager;
}
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java b/WitchRush/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java
index b33df55..fe9bb5d 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java
@@ -2,12 +2,10 @@ package net.berrygames.witchrush.commands;
import net.berrygames.witchrush.WitchRush;
import net.berrygames.witchrush.commands.admins.GameCMD;
-import net.berrygames.witchrush.commands.admins.LocationsCMD;
public class CommandsManager {
public void register(WitchRush main){
main.getCommand("gamestart").setExecutor(new GameCMD());
- main.getCommand("setlocation").setExecutor(new LocationsCMD());
}
}
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/commands/admins/LocationsCMD.java b/WitchRush/src/main/java/net/berrygames/witchrush/commands/admins/LocationsCMD.java
deleted file mode 100644
index 628a827..0000000
--- a/WitchRush/src/main/java/net/berrygames/witchrush/commands/admins/LocationsCMD.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package net.berrygames.witchrush.commands.admins;
-
-import net.berrygames.witchrush.WitchRush;
-import net.berrygames.witchrush.game.GameState;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class LocationsCMD implements CommandExecutor {
-
- @Override
- public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
- if(!(sender instanceof Player)) return false;
-
- Player player = (Player) sender;
- if(!player.isOp())return false;
-
- if(!GameState.getStatus().equals(GameState.LOBBY)) return false;
-
- if(args.length == 2){
- switch (args[0].toLowerCase()){
- case "bleu":
- switch (args[1].toLowerCase()){
- case "shop":
- WitchRush.get().setConf("teams.bleu.shop.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.bleu.shop.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.bleu.shop.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.bleu.shop.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.bleu.shop.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "spawn":
- WitchRush.get().setConf("teams.bleu.spawn.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.bleu.spawn.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.bleu.spawn.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.bleu.spawn.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.bleu.spawn.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "upgrade":
- WitchRush.get().setConf("teams.bleu.upgrade.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.bleu.upgrade.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.bleu.upgrade.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.bleu.upgrade.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.bleu.upgrade.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "boss":
- WitchRush.get().setConf("teams.bleu.boss.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.bleu.boss.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.bleu.boss.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.bleu.boss.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.bleu.boss.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- default:
- player.sendMessage("§cUsage: /setLocation [team] [shop|spawn|upgrade|boss]");
- break;
- }
- break;
- case "vert":
- switch (args[1].toLowerCase()){
- case "shop":
- WitchRush.get().setConf("teams.vert.shop.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.vert.shop.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.vert.shop.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.vert.shop.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.vert.shop.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "spawn":
- WitchRush.get().setConf("teams.vert.spawn.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.vert.spawn.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.vert.spawn.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.vert.spawn.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.vert.spawn.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "upgrade":
- WitchRush.get().setConf("teams.vert.upgrade.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.vert.upgrade.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.vert.upgrade.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.vert.upgrade.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.vert.upgrade.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "boss":
- WitchRush.get().setConf("teams.vert.boss.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.vert.boss.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.vert.boss.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.vert.boss.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.vert.boss.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- default:
- player.sendMessage("§cUsage: /setLocation [team] [shop|spawn|upgrade|boss]");
- break;
- }
- break;
- case "jaune":
- switch (args[1].toLowerCase()){
- case "shop":
- WitchRush.get().setConf("teams.jaune.shop.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.jaune.shop.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.jaune.shop.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.jaune.shop.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.jaune.shop.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "spawn":
- WitchRush.get().setConf("teams.jaune.spawn.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.jaune.spawn.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.jaune.spawn.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.jaune.spawn.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.jaune.spawn.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "upgrade":
- WitchRush.get().setConf("teams.jaune.upgrade.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.jaune.upgrade.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.jaune.upgrade.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.jaune.upgrade.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.jaune.upgrade.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "boss":
- WitchRush.get().setConf("teams.jaune.boss.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.jaune.boss.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.jaune.boss.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.jaune.boss.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.jaune.boss.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- default:
- player.sendMessage("§cUsage: /setLocation [team] [shop|spawn|upgrade|boss]");
- break;
- }
- break;
- case "rouge":
- switch (args[1].toLowerCase()){
- case "shop":
- WitchRush.get().setConf("teams.rouge.shop.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.rouge.shop.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.rouge.shop.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.rouge.shop.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.rouge.shop.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "spawn":
- WitchRush.get().setConf("teams.rouge.spawn.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.rouge.spawn.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.rouge.spawn.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.rouge.spawn.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.rouge.spawn.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "upgrade":
- WitchRush.get().setConf("teams.rouge.upgrade.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.rouge.upgrade.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.rouge.upgrade.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.rouge.upgrade.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.rouge.upgrade.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- case "boss":
- WitchRush.get().setConf("teams.rouge.boss.x", player.getLocation().getX());
- WitchRush.get().setConf("teams.rouge.boss.y", player.getLocation().getY());
- WitchRush.get().setConf("teams.rouge.boss.z", player.getLocation().getZ());
- WitchRush.get().setConf("teams.rouge.boss.yaw", player.getLocation().getYaw());
- WitchRush.get().setConf("teams.rouge.boss.pitch", player.getLocation().getPitch());
- player.sendMessage("Location ajoutée !");
- break;
- default:
- player.sendMessage("§cUsage: /setLocation [team] [shop|spawn|upgrade|boss]");
- break;
- }
- break;
- default:
- player.sendMessage("§cUsage: /setLocation [team] [shop|spawn|upgrade|boss]");
- break;
- }
- }
- return false;
- }
-
-}
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/kits/Kits.java b/WitchRush/src/main/java/net/berrygames/witchrush/kits/Kits.java
index 7f256ce..936bc18 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/kits/Kits.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/kits/Kits.java
@@ -31,7 +31,7 @@ public enum Kits {
return this.items;
}
- public static ArrayList getElfIKit(){
+ public static ArrayList getGoblinIKit(){
ArrayList list = new ArrayList<>();
list.add(new ItemFactory(Material.WOOD_SWORD).withName("§bSword Level I").done());
@@ -39,7 +39,7 @@ public enum Kits {
return list;
}
- public static ArrayList getElfIIKit(){
+ public static ArrayList getGoblinIIKit(){
ArrayList list = new ArrayList<>();
list.add(new ItemFactory(Material.STONE_SWORD).withName("§bSword Level II").done());
@@ -47,7 +47,7 @@ public enum Kits {
return list;
}
- public static ArrayList getElfIIIKit(){
+ public static ArrayList getGoblinIIIKit(){
ArrayList list = new ArrayList<>();
list.add(new ItemFactory(Material.IRON_SWORD).withName("§bSword Level III").done());
@@ -56,7 +56,7 @@ public enum Kits {
return list;
}
- public static ArrayList getGoblinIKit(){
+ public static ArrayList getElfIKit(){
ArrayList list = new ArrayList<>();
list.add(new ItemFactory(Material.BOW).withName("§bArc Level I").done());
@@ -65,7 +65,7 @@ public enum Kits {
return list;
}
- public static ArrayList getGoblinIIKit(){
+ public static ArrayList getElfIIKit(){
ArrayList list = new ArrayList<>();
list.add(new ItemFactory(Material.BOW).withName("§bArc Level II").withEnchant(Enchantment.ARROW_DAMAGE, 1).done());
@@ -74,7 +74,7 @@ public enum Kits {
return list;
}
- public static ArrayList getGoblinIIIKit(){
+ public static ArrayList getElfIIIKit(){
ArrayList list = new ArrayList<>();
list.add(new ItemFactory(Material.BOW).withName("§bArc Level III").withEnchant(Enchantment.ARROW_DAMAGE, 2).done());
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java
index b9fc76e..6518d61 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java
@@ -23,6 +23,7 @@ public class ListenersManager {
pm.registerEvents(new PlayerFood(), main);
pm.registerEvents(new InventoryClick(), main);
pm.registerEvents(new DamageEvent(), main);
+ pm.registerEvents(new PlayerMove(), main);
// --- WORLD ---//
pm.registerEvents(new WorldEvents(), main);
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/InventoryClick.java b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/InventoryClick.java
index f286d0e..a9c889a 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/InventoryClick.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/InventoryClick.java
@@ -58,6 +58,7 @@ public class InventoryClick implements Listener {
case DOUBLE_PLANT:
player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_YES, 1.0f, 1.0f);
teamManager.removePlayerAllTeam(player);
+ System.out.println(teamManager.getPlayerTeam(player));
player.sendMessage("§dVous serez dans une équipe au debut de la partie !");
player.closeInventory();
break;
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java
index d79f896..08e2a98 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java
@@ -6,6 +6,7 @@ import net.berrygames.witchrush.game.GameState;
import net.berrygames.witchrush.game.task.StartTask;
import net.berrygames.witchrush.team.TeamManager;
import net.berrygames.witchrush.tools.ItemFactory;
+import net.berrygames.witchrush.tools.Locations;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;
@@ -37,11 +38,8 @@ public class PlayerJoin implements Listener {
player.setExp(0f);
player.setHealth(20);
player.setFoodLevel(20);
- player.teleport(new Location(Bukkit.getWorld("world"), 0, 66, 0));
+ player.teleport(Locations.WAITING_ROOMS.getLoc());
witchPlayer.sendWaitingStuff();
- if(WitchPlayer.getwitchMap().size() >= 4){
- new StartTask().runTaskTimer(WitchRush.get(), 0, 20);
- }
if(player.isOp()){
player.getInventory().setItem(0, new ItemFactory(Material.FEATHER).withName("§cDémarrage forcé").done());
}
@@ -53,6 +51,7 @@ public class PlayerJoin implements Listener {
player.sendMessage(" ");
e.setJoinMessage(null);
witchPlayer.setSpectator(true);
+ player.teleport(Locations.SPECTATORS.getLoc());
player.setGameMode(GameMode.SPECTATOR);
player.setLevel(0);
player.setHealth(20);
@@ -65,6 +64,7 @@ public class PlayerJoin implements Listener {
player.sendMessage("§7Seuls les autres spectateurs voient vos messages !");
player.sendMessage(" ");
e.setJoinMessage(null);
+ player.teleport(Locations.SPECTATORS.getLoc());
player.setGameMode(GameMode.SPECTATOR);
player.setLevel(0);
player.setHealth(20);
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerMove.java b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerMove.java
new file mode 100644
index 0000000..93ba1dd
--- /dev/null
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerMove.java
@@ -0,0 +1,21 @@
+package net.berrygames.witchrush.listeners.players;
+
+import net.berrygames.witchrush.game.GameState;
+import net.berrygames.witchrush.tools.Locations;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerMoveEvent;
+
+public class PlayerMove implements Listener {
+
+ @EventHandler
+ public void move(PlayerMoveEvent e){
+ Player player = e.getPlayer();
+ if(player.getLocation().getBlockY() <= 110 && GameState.getStatus().equals(GameState.LOBBY)){
+ player.teleport(Locations.WAITING_ROOMS.getLoc());
+ player.sendMessage("§cNe tombe pas dans le néant !");
+ }
+ }
+
+}
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/world/WorldEvents.java b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/world/WorldEvents.java
index 1fb3f28..e0764b8 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/listeners/world/WorldEvents.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/world/WorldEvents.java
@@ -47,6 +47,13 @@ public class WorldEvents implements Listener {
break;
case GAME:
e.setCancelled(false);
+ switch (e.getBlock().getType()){
+ case SANDSTONE:
+ e.setCancelled(false);
+ break;
+ default: e.setCancelled(true);
+ break;
+ }
break;
case END:
e.setCancelled(true);
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamManager.java b/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamManager.java
index ac2a6fc..1b882f9 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamManager.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamManager.java
@@ -1,8 +1,7 @@
package net.berrygames.witchrush.team;
-import net.berrygames.witchrush.WitchRush;
+import net.berrygames.witchrush.tools.Locations;
import net.berrygames.witchrush.tools.WitchBoss;
-import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@@ -41,7 +40,9 @@ public class TeamManager {
}
public void addPlayerInRandomTeam(final Player player) {
- if(playerHaveTeam(player)) return;
+ for(TeamsInfos infos : TeamsInfos.values()){
+ if(isPlayerInTeam(player, infos)) return;
+ }
TreeMap> teamMap = new TreeMap<>();
for(TeamsInfos infos : TeamsInfos.values()){
teamMap.put(infos, getPlayersTeamList(infos));
@@ -54,49 +55,49 @@ public class TeamManager {
}
public Location getBossLocation(final TeamsInfos teamInfos) {
- return new Location(Bukkit.getWorld("world"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".boss.x"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".boss.y"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".boss.z"),
- WitchRush.get().getConf().getLong("teams."+teamInfos.getTeamName()+".boss.yaw"),
- WitchRush.get().getConf().getLong("teams."+teamInfos.getTeamName()+".boss.pitch"));
+ switch (teamInfos){
+ case JAUNE:
+ return Locations.BOSS_JAUNE.getLoc();
+ case ROUGE:
+ return Locations.BOSS_ROUGE.getLoc();
+ case VERT:
+ return Locations.BOSS_VERT.getLoc();
+ case BLEU:
+ return Locations.BOSS_BLEU.getLoc();
+ }
+ return null;
}
public Location getShopLocation(final TeamsInfos teamInfos) {
- return new Location(Bukkit.getWorld("world"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".shop.x"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".shop.y"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".shop.z"),
- WitchRush.get().getConf().getLong("teams."+teamInfos.getTeamName()+".shop.yaw"),
- WitchRush.get().getConf().getLong("teams."+teamInfos.getTeamName()+".shop.pitch"));
+ switch (teamInfos){
+ case JAUNE:
+ return Locations.SHOP_JAUNE.getLoc();
+ case ROUGE:
+ return Locations.SHOP_ROUGE.getLoc();
+ case VERT:
+ return Locations.SHOP_VERT.getLoc();
+ case BLEU:
+ return Locations.SHOP_BLEU.getLoc();
+ }
+ return null;
}
public Location getUpgradeLocation(final TeamsInfos teamInfos) {
- return new Location(Bukkit.getWorld("world"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".upgrade.x"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".upgrade.y"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".upgrade.z"),
- WitchRush.get().getConf().getLong("teams."+teamInfos.getTeamName()+".upgrade.yaw"),
- WitchRush.get().getConf().getLong("teams."+teamInfos.getTeamName()+".upgrade.pitch"));
- }
- public Location getTeamLocation(final TeamsInfos teamInfos) {
- return new Location(Bukkit.getWorld("world"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".spawn.x"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".spawn.y"),
- WitchRush.get().getConf().getDouble("teams."+teamInfos.getTeamName()+".spawn.z"),
- WitchRush.get().getConf().getLong("teams."+teamInfos.getTeamName()+".spawn.yaw"),
- WitchRush.get().getConf().getLong("teams."+teamInfos.getTeamName()+".spawn.pitch"));
+ switch (teamInfos){
+ case JAUNE:
+ return Locations.UPGRADE_JAUNE.getLoc();
+ case ROUGE:
+ return Locations.UPGRADE_ROUGE.getLoc();
+ case VERT:
+ return Locations.UPGRADE_VERT.getLoc();
+ case BLEU:
+ return Locations.UPGRADE_BLEU.getLoc();
+ }
+ return null;
}
public boolean isPlayerInTeam(final Player player, final TeamsInfos teamInfos) {
return this.playerTeamList.get(teamInfos) != null && this.playerTeamList.get(teamInfos).contains(player);
}
- public boolean playerHaveTeam(final Player player) {
- for (final TeamsInfos teamInfos : TeamsInfos.values()) {
- return isPlayerInTeam(player, teamInfos);
- }
- return false;
- }
-
public boolean teamIsFull(final TeamsInfos teamInfos) {
return this.playerTeamList.get(teamInfos) != null && this.playerTeamList.get(teamInfos).size() >= this.getPlayerTeamLimit();
}
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamsInfos.java b/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamsInfos.java
index 155be29..d7a245d 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamsInfos.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamsInfos.java
@@ -5,23 +5,25 @@ import org.bukkit.DyeColor;
public enum TeamsInfos {
- VERT(0,"Vert", "§a", DyeColor.LIME, (short)5, Color.GREEN, 23),
- BLEU(1,"Bleu", "§b", DyeColor.LIGHT_BLUE, (short)3, Color.BLUE, 19),
- JAUNE(2,"Jaune", "§e", DyeColor.YELLOW, (short)4, Color.YELLOW, 21),
- ROUGE(3,"Rouge", "§c", DyeColor.RED, (short)14, Color.RED, 25),
+ VERT(0,"Vert", "vert", "§a", DyeColor.LIME, (short)5, Color.GREEN, 23),
+ BLEU(1,"Bleu", "bleu", "§b", DyeColor.LIGHT_BLUE, (short)3, Color.BLUE, 19),
+ JAUNE(2,"Jaune", "jaune", "§e", DyeColor.YELLOW, (short)4, Color.YELLOW, 21),
+ ROUGE(3,"Rouge", "rouge", "§c", DyeColor.RED, (short)14, Color.RED, 25),
;
private int id;
private String teamName;
+ private String configName;
private String chatColor;
private short dataClay;
private Color color;
private DyeColor dyeColor;
private int slotGUI;
- TeamsInfos(int id, String teamName, String chatColor, DyeColor dyeColor, short dataClay, Color color, int slotGUI) {
+ TeamsInfos(int id, String teamName, String configName, String chatColor, DyeColor dyeColor, short dataClay, Color color, int slotGUI) {
this.id = id;
this.teamName = teamName;
+ this.configName = configName;
this.chatColor = chatColor;
this.dyeColor = dyeColor;
this.dataClay = dataClay;
@@ -49,6 +51,10 @@ public enum TeamsInfos {
return color;
}
+ public String getConfigName() {
+ return configName;
+ }
+
public int getId() {
return id;
}
@@ -83,5 +89,4 @@ public enum TeamsInfos {
}
return null;
}
-
}
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/tools/DeadPlayer.java b/WitchRush/src/main/java/net/berrygames/witchrush/tools/DeadPlayer.java
index 79a1214..9c5bc19 100644
--- a/WitchRush/src/main/java/net/berrygames/witchrush/tools/DeadPlayer.java
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/tools/DeadPlayer.java
@@ -21,6 +21,7 @@ public class DeadPlayer {
this.witchPlayer.setSpectator(true);
player.setHealth(20);
player.setGameMode(GameMode.SPECTATOR);
+ player.teleport(Locations.SPECTATORS.getLoc());
player.sendTitle("§cVous êtes mort", " ");
task = Bukkit.getScheduler().runTaskTimer(WitchRush.get(), new Runnable() {
@Override
diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/tools/Locations.java b/WitchRush/src/main/java/net/berrygames/witchrush/tools/Locations.java
new file mode 100644
index 0000000..1b18fbc
--- /dev/null
+++ b/WitchRush/src/main/java/net/berrygames/witchrush/tools/Locations.java
@@ -0,0 +1,43 @@
+package net.berrygames.witchrush.tools;
+
+import net.berrygames.witchrush.team.TeamsInfos;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+
+public enum Locations {
+
+ WAITING_ROOMS(new Location(Bukkit.getWorld("world"), -177, 153, 139.5, 0, 0)),
+ SPECTATORS(new Location(Bukkit.getWorld("world"), -50.5, 114, 51.5, 0, 0)),
+
+ SPAWN_JAUNE(new Location(Bukkit.getWorld("world"), 72.5, 98, 59, 90, 0)),
+ SPAWN_VERT(new Location(Bukkit.getWorld("world"), -58.5, 98, 177, -180, 0)),
+ SPAWN_BLEU(new Location(Bukkit.getWorld("world"), -45, 98, -74.5, 0, 0)),
+ SPAWN_ROUGE(new Location(Bukkit.getWorld("world"), -49.5, 91, 116.5, 180, 0)),
+
+ UPGRADE_JAUNE(new Location(Bukkit.getWorld("world"), 76.5, 97, 70.5, 130, 0)),
+ UPGRADE_VERT(new Location(Bukkit.getWorld("world"), -70.5, 97, 179.5, -100, 0)),
+ UPGRADE_BLEU(new Location(Bukkit.getWorld("world"), -34.5, 97, -78.5, 79, 0)),
+ UPGRADE_ROUGE(new Location(Bukkit.getWorld("world"), -49.5, 91, 116.5, 180, 0)),
+
+ SHOP_JAUNE(new Location(Bukkit.getWorld("world"), 66.5, 97, 72.5, -150, 0)),
+ SHOP_VERT(new Location(Bukkit.getWorld("world"), -71.5, 97, 170.5, -60, 0)),
+ SHOP_BLEU(new Location(Bukkit.getWorld("world"), -32.5, 97, -69.5, 120, 0)),
+ SHOP_ROUGE(new Location(Bukkit.getWorld("world"), -172.5, 98, 31.5, 30, 0)),
+
+ BOSS_JAUNE(new Location(Bukkit.getWorld("world"), 12.5, 91, 49.5, 90, 0)),
+ BOSS_VERT(new Location(Bukkit.getWorld("world"), -49.5, 91, 116.5, 180, 0)),
+ BOSS_BLEU(new Location(Bukkit.getWorld("world"), -54.5, 91, -15.5, 0,0)),
+ BOSS_ROUGE(new Location(Bukkit.getWorld("world"), -172.5, 98, 31.5, 30, 0)),
+
+ ;
+
+ private Location loc;
+
+ Locations(Location loc) {
+ this.loc = loc;
+ }
+
+ public Location getLoc() {
+ return loc;
+ }
+}
diff --git a/WitchRush/src/main/resources/4x4.yml b/WitchRush/src/main/resources/4x4.yml
deleted file mode 100644
index 37a8c6a..0000000
--- a/WitchRush/src/main/resources/4x4.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-teams:
-
- bleu:
- x:
- y:
- z:
- yaw:
- pitch:
-
- rouge:
- x:
- y:
- z:
- yaw:
- pitch:
-
- jaune:
- x:
- y:
- z:
- yaw:
- pitch:
-
- vert:
- x:
- y:
- z:
- yaw:
- pitch:
\ No newline at end of file
diff --git a/WitchRush/src/main/resources/config.yml b/WitchRush/src/main/resources/config.yml
deleted file mode 100644
index 3c3eb78..0000000
--- a/WitchRush/src/main/resources/config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-game:
- mode: "4x4"
- bossLife: 500
\ No newline at end of file
diff --git a/WitchRush/src/main/resources/plugin.yml b/WitchRush/src/main/resources/plugin.yml
index 48572fc..55abdfc 100644
--- a/WitchRush/src/main/resources/plugin.yml
+++ b/WitchRush/src/main/resources/plugin.yml
@@ -6,5 +6,3 @@ website: berrygames.net
commands:
gamestart:
- setlocation:
- aliases: [setloc, loc]
\ No newline at end of file
diff --git a/WitchRush/target/WitchRush-1.0-SNAPSHOT.jar b/WitchRush/target/WitchRush-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..6832fc9
Binary files /dev/null and b/WitchRush/target/WitchRush-1.0-SNAPSHOT.jar differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/WitchPlayer$1.class b/WitchRush/target/classes/net/berrygames/witchrush/WitchPlayer$1.class
new file mode 100644
index 0000000..5687e56
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/WitchPlayer$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/WitchPlayer.class b/WitchRush/target/classes/net/berrygames/witchrush/WitchPlayer.class
new file mode 100644
index 0000000..ad3183d
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/WitchPlayer.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/WitchRush.class b/WitchRush/target/classes/net/berrygames/witchrush/WitchRush.class
new file mode 100644
index 0000000..c06186d
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/WitchRush.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/commands/CommandsManager.class b/WitchRush/target/classes/net/berrygames/witchrush/commands/CommandsManager.class
new file mode 100644
index 0000000..edad4ae
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/commands/CommandsManager.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/commands/admins/GameCMD.class b/WitchRush/target/classes/net/berrygames/witchrush/commands/admins/GameCMD.class
new file mode 100644
index 0000000..f779daa
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/commands/admins/GameCMD.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/game/GameManager.class b/WitchRush/target/classes/net/berrygames/witchrush/game/GameManager.class
new file mode 100644
index 0000000..a01b631
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/game/GameManager.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/game/GameState.class b/WitchRush/target/classes/net/berrygames/witchrush/game/GameState.class
new file mode 100644
index 0000000..7f7b6b5
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/game/GameState.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/game/WinManager.class b/WitchRush/target/classes/net/berrygames/witchrush/game/WinManager.class
new file mode 100644
index 0000000..ee6fab5
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/game/WinManager.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/game/task/HealthRunnable.class b/WitchRush/target/classes/net/berrygames/witchrush/game/task/HealthRunnable.class
new file mode 100644
index 0000000..b13f333
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/game/task/HealthRunnable.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/game/task/PVPTask.class b/WitchRush/target/classes/net/berrygames/witchrush/game/task/PVPTask.class
new file mode 100644
index 0000000..8087326
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/game/task/PVPTask.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/game/task/StartTask.class b/WitchRush/target/classes/net/berrygames/witchrush/game/task/StartTask.class
new file mode 100644
index 0000000..28e8da7
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/game/task/StartTask.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/kits/Kits.class b/WitchRush/target/classes/net/berrygames/witchrush/kits/Kits.class
new file mode 100644
index 0000000..bcd4d9f
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/kits/Kits.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/ListenersManager.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/ListenersManager.class
new file mode 100644
index 0000000..6c69459
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/ListenersManager.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/DamageEvent$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/DamageEvent$1.class
new file mode 100644
index 0000000..3fd071c
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/DamageEvent$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/DamageEvent.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/DamageEvent.class
new file mode 100644
index 0000000..8f9d909
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/DamageEvent.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/EntityDeath$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/EntityDeath$1.class
new file mode 100644
index 0000000..31d3568
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/EntityDeath$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/EntityDeath.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/EntityDeath.class
new file mode 100644
index 0000000..4aabf3c
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/entities/EntityDeath.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/InventoryClick$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/InventoryClick$1.class
new file mode 100644
index 0000000..3bc5ebc
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/InventoryClick$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/InventoryClick.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/InventoryClick.class
new file mode 100644
index 0000000..ed834e4
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/InventoryClick.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerChat$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerChat$1.class
new file mode 100644
index 0000000..ea3d1bd
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerChat$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerChat.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerChat.class
new file mode 100644
index 0000000..b1217d2
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerChat.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerDeath$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerDeath$1.class
new file mode 100644
index 0000000..0b3d986
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerDeath$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerDeath.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerDeath.class
new file mode 100644
index 0000000..f2cda25
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerDeath.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerFood.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerFood.class
new file mode 100644
index 0000000..cdb5688
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerFood.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerInteract$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerInteract$1.class
new file mode 100644
index 0000000..fbf97b6
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerInteract$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerInteract.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerInteract.class
new file mode 100644
index 0000000..f70be80
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerInteract.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerJoin$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerJoin$1.class
new file mode 100644
index 0000000..5926050
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerJoin$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerJoin.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerJoin.class
new file mode 100644
index 0000000..5eeaea5
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerJoin.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerMove.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerMove.class
new file mode 100644
index 0000000..2ad6816
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerMove.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerQuit$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerQuit$1.class
new file mode 100644
index 0000000..fa58742
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerQuit$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerQuit.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerQuit.class
new file mode 100644
index 0000000..1ae1810
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/players/PlayerQuit.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/servers/ServerPing.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/servers/ServerPing.class
new file mode 100644
index 0000000..15c71c3
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/servers/ServerPing.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/world/WorldEvents$1.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/world/WorldEvents$1.class
new file mode 100644
index 0000000..1f161fd
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/world/WorldEvents$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/listeners/world/WorldEvents.class b/WitchRush/target/classes/net/berrygames/witchrush/listeners/world/WorldEvents.class
new file mode 100644
index 0000000..6a519de
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/listeners/world/WorldEvents.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/shop/ShopGui.class b/WitchRush/target/classes/net/berrygames/witchrush/shop/ShopGui.class
new file mode 100644
index 0000000..38e1167
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/shop/ShopGui.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/shop/UpgradeGUI.class b/WitchRush/target/classes/net/berrygames/witchrush/shop/UpgradeGUI.class
new file mode 100644
index 0000000..3a3431e
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/shop/UpgradeGUI.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/team/TeamManager$1.class b/WitchRush/target/classes/net/berrygames/witchrush/team/TeamManager$1.class
new file mode 100644
index 0000000..8c36fc0
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/team/TeamManager$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/team/TeamManager.class b/WitchRush/target/classes/net/berrygames/witchrush/team/TeamManager.class
new file mode 100644
index 0000000..8868b08
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/team/TeamManager.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/team/TeamsInfos.class b/WitchRush/target/classes/net/berrygames/witchrush/team/TeamsInfos.class
new file mode 100644
index 0000000..be3f0b4
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/team/TeamsInfos.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/team/TeamsMenu.class b/WitchRush/target/classes/net/berrygames/witchrush/team/TeamsMenu.class
new file mode 100644
index 0000000..abd70a8
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/team/TeamsMenu.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/tools/DeadPlayer$1.class b/WitchRush/target/classes/net/berrygames/witchrush/tools/DeadPlayer$1.class
new file mode 100644
index 0000000..cb17be8
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/tools/DeadPlayer$1.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/tools/DeadPlayer.class b/WitchRush/target/classes/net/berrygames/witchrush/tools/DeadPlayer.class
new file mode 100644
index 0000000..5106634
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/tools/DeadPlayer.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/tools/ItemFactory.class b/WitchRush/target/classes/net/berrygames/witchrush/tools/ItemFactory.class
new file mode 100644
index 0000000..becbb86
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/tools/ItemFactory.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/tools/Locations.class b/WitchRush/target/classes/net/berrygames/witchrush/tools/Locations.class
new file mode 100644
index 0000000..cdcebcb
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/tools/Locations.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/tools/PNJSpawner.class b/WitchRush/target/classes/net/berrygames/witchrush/tools/PNJSpawner.class
new file mode 100644
index 0000000..a04f535
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/tools/PNJSpawner.class differ
diff --git a/WitchRush/target/classes/net/berrygames/witchrush/tools/WitchBoss.class b/WitchRush/target/classes/net/berrygames/witchrush/tools/WitchBoss.class
new file mode 100644
index 0000000..f2efb36
Binary files /dev/null and b/WitchRush/target/classes/net/berrygames/witchrush/tools/WitchBoss.class differ
diff --git a/WitchRush/target/classes/plugin.yml b/WitchRush/target/classes/plugin.yml
new file mode 100644
index 0000000..55abdfc
--- /dev/null
+++ b/WitchRush/target/classes/plugin.yml
@@ -0,0 +1,8 @@
+name: WitchRush
+version: 1.0
+author: BunSLaPatate
+main: net.berrygames.witchrush.WitchRush
+website: berrygames.net
+
+commands:
+ gamestart:
diff --git a/WitchRush/target/maven-archiver/pom.properties b/WitchRush/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..b9a47b2
--- /dev/null
+++ b/WitchRush/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Wed Oct 24 00:18:38 CEST 2018
+groupId=net.berrygames.witchrush
+artifactId=WitchRush
+version=1.0-SNAPSHOT
diff --git a/WitchRush/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/WitchRush/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..c91a28b
--- /dev/null
+++ b/WitchRush/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,46 @@
+net\berrygames\witchrush\team\TeamsInfos.class
+net\berrygames\witchrush\team\TeamsMenu.class
+net\berrygames\witchrush\listeners\entities\DamageEvent.class
+net\berrygames\witchrush\listeners\players\InventoryClick.class
+net\berrygames\witchrush\listeners\players\PlayerFood.class
+net\berrygames\witchrush\shop\ShopGui.class
+net\berrygames\witchrush\listeners\entities\EntityDeath$1.class
+net\berrygames\witchrush\listeners\entities\DamageEvent$1.class
+net\berrygames\witchrush\kits\Kits.class
+net\berrygames\witchrush\tools\DeadPlayer$1.class
+net\berrygames\witchrush\listeners\players\PlayerInteract.class
+net\berrygames\witchrush\game\WinManager.class
+net\berrygames\witchrush\commands\admins\GameCMD.class
+net\berrygames\witchrush\listeners\players\PlayerJoin.class
+net\berrygames\witchrush\game\task\StartTask.class
+net\berrygames\witchrush\WitchPlayer$1.class
+net\berrygames\witchrush\listeners\players\PlayerInteract$1.class
+net\berrygames\witchrush\game\task\HealthRunnable.class
+net\berrygames\witchrush\listeners\world\WorldEvents.class
+net\berrygames\witchrush\tools\WitchBoss.class
+net\berrygames\witchrush\commands\CommandsManager.class
+net\berrygames\witchrush\shop\UpgradeGUI.class
+net\berrygames\witchrush\WitchRush.class
+net\berrygames\witchrush\listeners\entities\EntityDeath.class
+net\berrygames\witchrush\tools\Locations.class
+net\berrygames\witchrush\listeners\players\PlayerDeath$1.class
+net\berrygames\witchrush\listeners\world\WorldEvents$1.class
+net\berrygames\witchrush\listeners\players\PlayerJoin$1.class
+net\berrygames\witchrush\listeners\ListenersManager.class
+net\berrygames\witchrush\game\GameManager.class
+net\berrygames\witchrush\listeners\players\PlayerQuit.class
+net\berrygames\witchrush\listeners\players\PlayerQuit$1.class
+net\berrygames\witchrush\tools\ItemFactory.class
+net\berrygames\witchrush\listeners\players\PlayerChat.class
+net\berrygames\witchrush\listeners\servers\ServerPing.class
+net\berrygames\witchrush\game\task\PVPTask.class
+net\berrygames\witchrush\listeners\players\PlayerDeath.class
+net\berrygames\witchrush\team\TeamManager.class
+net\berrygames\witchrush\tools\PNJSpawner.class
+net\berrygames\witchrush\game\GameState.class
+net\berrygames\witchrush\listeners\players\InventoryClick$1.class
+net\berrygames\witchrush\listeners\players\PlayerChat$1.class
+net\berrygames\witchrush\tools\DeadPlayer.class
+net\berrygames\witchrush\team\TeamManager$1.class
+net\berrygames\witchrush\listeners\players\PlayerMove.class
+net\berrygames\witchrush\WitchPlayer.class
diff --git a/WitchRush/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/WitchRush/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..bff0f6a
--- /dev/null
+++ b/WitchRush/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,34 @@
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\commands\CommandsManager.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\entities\DamageEvent.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\ListenersManager.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\commands\admins\GameCMD.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\game\task\StartTask.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\players\PlayerChat.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\shop\ShopGui.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\entities\EntityDeath.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\players\PlayerFood.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\team\TeamsInfos.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\servers\ServerPing.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\players\PlayerDeath.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\tools\Locations.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\players\PlayerQuit.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\WitchPlayer.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\players\PlayerMove.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\game\task\PVPTask.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\tools\ItemFactory.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\game\WinManager.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\team\TeamsMenu.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\WitchRush.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\game\GameState.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\world\WorldEvents.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\players\PlayerInteract.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\players\PlayerJoin.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\shop\UpgradeGUI.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\listeners\players\InventoryClick.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\tools\DeadPlayer.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\game\GameManager.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\game\task\HealthRunnable.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\tools\WitchBoss.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\tools\PNJSpawner.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\kits\Kits.java
+C:\Users\asus\Desktop\Dev\WorkSpace\WitchRush\WitchRush\src\main\java\net\berrygames\witchrush\team\TeamManager.java
diff --git a/WitchRush/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/WitchRush/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 0000000..e69de29
diff --git a/WitchRush/target/original-WitchRush-1.0-SNAPSHOT.jar b/WitchRush/target/original-WitchRush-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..ba6e4c4
Binary files /dev/null and b/WitchRush/target/original-WitchRush-1.0-SNAPSHOT.jar differ