SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Merge branch 'lixfel' into 'master'

Quellcode durchsuchen 
Fixes, Fixes, Fixes

See merge request Yaruma3341/fightsystem!9
Dieser Commit ist enthalten in:
Yaruma3341 2019-03-26 16:40:19 +01:00
Commit c76cac319e
40 geänderte Dateien mit 281 neuen und 219 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
.gitignore vendored
Datei anzeigen

@ -1,3 +1 @@
.idea
pom.xml
*.iml

25
fightsystem.iml Normale Datei
Datei anzeigen

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: warking:SpigotCore:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: warking:WorldEdit:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: warking:FAWE:1.0" level="project" />
</component>
</module>

78
pom.xml Normale Datei
Datei anzeigen

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.yaruma</groupId>
<artifactId>FightSystem</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<url>https://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
<repository>
<id>maven</id>
<url>https://warking.de:81/maven/</url>
</repository>
<repository>
<id>spigotmc-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.kt</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>warking</groupId>
<artifactId>SpigotCore</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>warking</groupId>
<artifactId>WorldEdit</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>warking</groupId>
<artifactId>FAWE</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

8
config.yml → src/config.yml
Datei anzeigen

@ -3,7 +3,6 @@ Times:
SetupDuration: 0
PreFightDuration: 0
SpectatorDuration: 0
Arena:
Schemsize:
x: 0
@ -22,30 +21,25 @@ Arena:
z: 0
underArenaBorder: 0
BorderFromSchematic: 0
Output:
TeamRedColor: &c
TeamBlueColor: &3
TeamRedName: Team1
TeamBlueName: Team2
GameName: AirWargear
GameName: AirShip
TeamChatDetection: +
WinConditions:
Timeout: boolean
AllDead: boolean
CaptainDead: boolean
PercentSystem: boolean
Entern: boolean
WinConditionParams:
TimeoutTime: 0
EnterPhaseBegin: 0
PercentWin: 0
Fight:
OnlyPublicSchematics: boolean
Money:
Win: 0
Lose: 0

67
src/me/yaruma/fightsystem/FightSystem.java
Datei anzeigen

@ -24,8 +24,8 @@ import java.io.File;
public class FightSystem extends JavaPlugin {
public static String PREFIX = "[FightSystem] ";
public static String NOPERM = PREFIX + "§4Du darfst das nicht!";
public static final String PREFIX = "§6Arena§8» ";
public static final String NOPERM = PREFIX + "§cDu darfst das nicht!";
private static FightSystem plugin;
private FileManager fileManager;
@ -37,44 +37,42 @@ public class FightSystem extends JavaPlugin {
private FightState fightState;
public Location Team1SpawnLoc = null;
public Location Team2SpawnLoc = null;
public Location SpecSpawnLoc = null;
public Location Team1PasteLoc = null;
public Location Team2PasteLoc = null;
private Location Team1SpawnLoc = null;
private Location Team2SpawnLoc = null;
private Location SpecSpawnLoc = null;
private Location Team1PasteLoc = null;
private Location Team2PasteLoc = null;
public int ArenaMinX;
public int ArenaMaxX;
public int ArenaMinZ;
public int ArenaMaxZ;
public int schemsizeX;
public int schemsizeY;
public int schemsizeZ;
private int schemsizeX;
private int schemsizeY;
private int schemsizeZ;
public int team1cornerX;
public int team1cornerY;
public int team1cornerZ;
private int team1cornerX;
private int team1cornerY;
private int team1cornerZ;
public int team2cornerX;
public int team2cornerY;
public int team2cornerZ;
private int team2cornerX;
private int team2cornerY;
private int team2cornerZ;
public int underArenaBorder;
public int fightTime = 0;
public double damageRed = 0D;
public double getDamageBlue = 0D;
public boolean entern = false;
public File kits = new File("plugins/" + this.getName(), "kits.data");
public FileConfiguration getKitData = YamlConfiguration.loadConfiguration(kits);
private final File kits = new File("plugins/" + this.getName(), "kits.data");
private final FileConfiguration getKitData = YamlConfiguration.loadConfiguration(kits);
public void saveKitData() {
try { getKitData.save(kits); } catch (Exception ex) { }
private void saveKitData() {
try { getKitData.save(kits); } catch (Exception ignored) { }
}
@ -171,14 +169,10 @@ public class FightSystem extends JavaPlugin {
int setupDuration = fileManager.getIntegerFromConfig("Times.NoPlayersOnlineDuration");
Countdown countdown = new Countdown(setupDuration, new FinishNoPlayersOnline());
countdown.startTimer(getPlugin());
System.out.println(PREFIX + "§aPlugin gestartet!");
}
public void onDisable() {
System.out.println(PREFIX + "§cPlugin deaktiviert!");
}
private void init() {
@ -276,9 +270,7 @@ public class FightSystem extends JavaPlugin {
WorldEdit.replace(Fight.getBlueTeam().getLeader().getPlayer(), team1cornerX, team1cornerY, team1cornerZ, team1cornerX + schemsizeX, team1cornerY + schemsizeY, team1cornerZ + schemsizeZ);
WorldEdit.replace(Fight.getRedTeam().getLeader().getPlayer(), team2cornerX, team2cornerY, team2cornerZ, team2cornerX + schemsizeX, team2cornerY + schemsizeY, team2cornerZ + schemsizeZ);
Bukkit.broadcastMessage(" ");
Bukkit.broadcastMessage("§aDer Fight beginnt!");
Bukkit.broadcastMessage(" ");
Bukkit.broadcastMessage(PREFIX + "§aDer Kampf beginnt!");
}
private void setAllPlayersGM(GameMode gm) {
@ -303,7 +295,7 @@ public class FightSystem extends JavaPlugin {
WinconditionTimeout.timeout();
WinconditionEntern.entern();
Bukkit.broadcastMessage("§aArena freigegeben!");
Bukkit.broadcastMessage(PREFIX + "§aArena freigegeben!");
}
public void setSpectateState(FightTeam winFightTeam) {
@ -316,8 +308,7 @@ public class FightSystem extends JavaPlugin {
Bukkit.broadcastMessage(" ");
if(winFightTeam != null) {
Bukkit.broadcastMessage(PREFIX + "§aDas Team von §6" + winFightTeam.getLeader().getPlayer().getName() + " §ahat gewonnen!");
Bukkit.broadcastMessage(PREFIX + "§aDas Team " + winFightTeam.getPrefix() + winFightTeam.getName() + " §ahat gewonnen!");
plugin.getFightManager().teleportAllToFightSpawn();
for(FightPlayer fightPlayer : winFightTeam.getPlayers()) {
@ -328,21 +319,21 @@ public class FightSystem extends JavaPlugin {
CoinSystem.getCoinsManager(fightPlayer.getPlayer()).addCoins(getMoneyToPay("Money.Lose"));
}
} else {
//Keine Message! Wird in FinishTimeOver gesendet!
for(FightPlayer fightPlayer : winFightTeam.getPlayers()) {
Bukkit.broadcastMessage(PREFIX + "§aKein Team hat gewonnen!");
for(FightPlayer fightPlayer : Fight.getBlueTeam().getPlayers()) {
CoinSystem.getCoinsManager(fightPlayer.getPlayer()).addCoins(getMoneyToPay("Money.Undecided"));
}
for(FightPlayer fightPlayer : Fight.getOpposite(winFightTeam).getPlayers()) {
for(FightPlayer fightPlayer : Fight.getRedTeam().getPlayers()) {
CoinSystem.getCoinsManager(fightPlayer.getPlayer()).addCoins(getMoneyToPay("Money.Undecided"));
}
}
Countdown countdown = new Countdown(20*60, new FinishSpectateOver());
Countdown countdown = new Countdown(fileManager.getIntegerFromConfig("Times.SpectatorDuration"), new FinishSpectateOver());
countdown.startTimer(FightSystem.getPlugin());
}
public int getMoneyToPay(String moneyPath) {
private int getMoneyToPay(String moneyPath) {
return fileManager.getIntegerFromConfig(moneyPath);
}
@ -432,10 +423,12 @@ public class FightSystem extends JavaPlugin {
}
public double getDamageRed() {
double damageRed = 0D;
return damageRed;
}
public double getGetDamageBlue() {
double getDamageBlue = 0D;
return getDamageBlue;
}

6
src/me/yaruma/fightsystem/commands/AkCommand.java
Datei anzeigen

@ -64,12 +64,12 @@ public class AkCommand implements CommandExecutor {
if(!Fight.getBlueTeam().hasTeamLeader()){
FightPlayer fightPlayer = new FightPlayer(player, false);
Fight.getBlueTeam().setLeader(fightPlayer);
player.sendMessage(FightSystem.PREFIX + "§aDu bist nun Leader von " + fileManager.getStringFromConfig("Output.TeamBlueColor") + fileManager.getStringFromConfig("Output.TeamBlueName"));
player.sendMessage(FightSystem.PREFIX + "§aDu bist nun Leader von " + Fight.getBlueTeam().getPrefix() + Fight.getBlueTeam().getName());
} else if(!Fight.getRedTeam().hasTeamLeader()){
FightPlayer fightPlayer = new FightPlayer(player, false);
Fight.getBlueTeam().setLeader(fightPlayer);
player.sendMessage(FightSystem.PREFIX + "§aDu bist nun Leader von " + fileManager.getStringFromConfig("Output.TeamRedColor") + fileManager.getStringFromConfig("Output.TeamRedName"));
player.sendMessage(FightSystem.PREFIX + "§aDu bist nun Leader von " + Fight.getRedTeam().getPrefix() + Fight.getRedTeam().getName());
} else
player.sendMessage(FightSystem.PREFIX + "§cEs sind bereits zwei Leader vorhanden!");
@ -107,7 +107,7 @@ public class AkCommand implements CommandExecutor {
if(fightPlayer.isLeader() && fightTeam.isPlayerInTeam(target)){
fightTeam.removePlayer(target);
player.sendMessage(FightSystem.PREFIX + "§aDu hast den Spieler §6" + target.getName() + " §aaus dem Team entfernt!");
target.sendMessage(FightSystem.PREFIX + "§4Du wurdest auf deinem Team entfernt!");
target.sendMessage(FightSystem.PREFIX + "§cDu wurdest auf deinem Team entfernt!");
}
}
}

4
src/me/yaruma/fightsystem/fight/Fight.java
Datei anzeigen

@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
public class Fight {
public static FightTeam redTeam = new FightTeam(null, FightSystem.getPlugin());
public static FightTeam blueTeam = new FightTeam(null, FightSystem.getPlugin());
public static final FightTeam redTeam = new FightTeam(null, FightSystem.getPlugin());
public static final FightTeam blueTeam = new FightTeam(null, FightSystem.getPlugin());
public static FightTeam getPlayerTeam(Player player) {

3
src/me/yaruma/fightsystem/fight/FightCreator.java
Datei anzeigen

@ -2,8 +2,9 @@ package me.yaruma.fightsystem.fight;
import org.bukkit.entity.Player;
public class FightCreator {
class FightCreator {
@SuppressWarnings("EmptyMethod")
public static void invitePlayerToTeam(Player player) {
}

2
src/me/yaruma/fightsystem/fight/FightState.java
Datei anzeigen

@ -5,5 +5,5 @@ public enum FightState {
SETUP,
PRE_RUNNING,
RUNNING,
SPECTATE;
SPECTATE
}

6
src/me/yaruma/fightsystem/fight/FightTeam.java
Datei anzeigen

@ -11,10 +11,10 @@ import java.util.ArrayList;
public class FightTeam {
private FightPlayer leader;
private ArrayList<FightPlayer> players;
private final ArrayList<FightPlayer> players;
private FightSystem plugin;
private boolean ready;
private ArrayList<Player> invited;
private final ArrayList<Player> invited;
private String name;
private String prefix;
@ -115,7 +115,7 @@ public class FightTeam {
FightSystem instance = FightSystem.getPlugin();
if(this.ready == true) {
if(this.ready) {
fightTeam.getLeader().getPlayer().getInventory().setItem(3, new ItemBuilder(Material.INK_SACK, (short) 8).removeAllAtributs().addEnchantment(Enchantment.DURABILITY,1 ).setDisplayName("§aBereit").build());
broadcast(FightSystem.PREFIX + "§aEuer Team ist nun bereit!");

32
src/me/yaruma/fightsystem/fight/WaterRemover.java
Datei anzeigen

@ -15,18 +15,15 @@ import java.util.List;
public class WaterRemover {
private List<AbstractMap.SimpleEntry<Location, Integer>> explodedBlocks = new ArrayList<AbstractMap.SimpleEntry<Location, Integer>>();
private List<Block> waterList = new ArrayList<Block>();
private List<AbstractMap.SimpleEntry<Location, Integer>> explodedBlocks = new ArrayList<>();
private List<Block> waterList = new ArrayList<>();
private BukkitTask task;
public void start() {
this.stop();
this.explodedBlocks = new ArrayList<AbstractMap.SimpleEntry<Location, Integer>>();
this.waterList = new ArrayList<Block>();
this.task = Bukkit.getScheduler().runTaskTimerAsynchronously((Plugin)FightSystem.getPlugin(), new Runnable(){
@Override
public void run() {
this.explodedBlocks = new ArrayList<>();
this.waterList = new ArrayList<>();
this.task = Bukkit.getScheduler().runTaskTimerAsynchronously((Plugin)FightSystem.getPlugin(), () -> {
try {
WaterRemover.this.wateredCheck();
WaterRemover.this.removeWater();
@ -34,22 +31,21 @@ public class WaterRemover {
catch (Exception e) {
e.printStackTrace();
}
}
}, 0L, 20L);
}
public void stop() {
private void stop() {
if (this.task != null) {
this.task.cancel();
}
}
public void add(Location loc) {
this.explodedBlocks.add(new AbstractMap.SimpleEntry<Location, Integer>(loc, 0));
this.explodedBlocks.add(new AbstractMap.SimpleEntry<>(loc, 0));
}
private void wateredCheck() {
for (int i = 0; i < this.explodedBlocks.size(); ++i) {
for (int i = this.explodedBlocks.size() - 1; i >= 0; i--) {
if (this.explodedBlocks.get(i).getValue() >= 15) {
Block b = this.explodedBlocks.get(i).getKey().getBlock();
if (b.getType() == Material.WATER || b.getType() == Material.STATIONARY_WATER) {
@ -63,12 +59,10 @@ public class WaterRemover {
}
private void removeWater() {
ArrayList<Block> blocksToRemove = new ArrayList<Block>();
ArrayList<Block> blocksToRemove = new ArrayList<>();
for (int i = this.waterList.size() - 1; i > -1; --i) {
Block current = this.waterList.get(i);
for (Block removeBlock : this.getSourceBlocksOfWater(current)) {
blocksToRemove.add(removeBlock);
}
blocksToRemove.addAll(this.getSourceBlocksOfWater(current));
if (current.getType() != Material.AIR) continue;
this.waterList.remove(i);
}
@ -80,12 +74,12 @@ public class WaterRemover {
}
private List<Block> getSourceBlocksOfWater(Block startBlock) {
ArrayList<Block> water = new ArrayList<Block>();
this.collectBlocks(startBlock, water, new ArrayList<Block>());
ArrayList<Block> water = new ArrayList<>();
this.collectBlocks(startBlock, water, new ArrayList<>());
return water;
}
public void collectBlocks(Block anchor, List<Block> collected, List<Block> visitedBlocks) {
private void collectBlocks(Block anchor, List<Block> collected, List<Block> visitedBlocks) {
if (anchor.getType() != Material.WATER && anchor.getType() != Material.STATIONARY_WATER) {
return;
}

2
src/me/yaruma/fightsystem/listener/BlockBreakListener.java
Datei anzeigen

@ -10,7 +10,7 @@ import org.bukkit.event.block.BlockBreakEvent;
public class BlockBreakListener implements Listener {
FightSystem instance = FightSystem.getPlugin();
private final FightSystem instance = FightSystem.getPlugin();
@EventHandler
public void handleBlockBreak(BlockBreakEvent event) {

16
src/me/yaruma/fightsystem/listener/EntityDamageByEntityListener.java
Datei anzeigen

@ -11,14 +11,13 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
public class EntityDamageByEntityListener implements Listener {
FightSystem instance = FightSystem.getPlugin();
private final FightSystem instance = FightSystem.getPlugin();
@EventHandler
public void handleEntityDamageByEntity(EntityDamageByEntityEvent event) {
if(instance.getFightState() != FightState.RUNNING) {
event.setCancelled(true);
} else {
if(event.getEntity() instanceof Player) {
} else if(event.getEntity() instanceof Player) {
Player player = ((Player) event.getEntity()).getPlayer();
if(event.getDamager() instanceof Player) {
@ -27,14 +26,11 @@ public class EntityDamageByEntityListener implements Listener {
if(Fight.getPlayerTeam(player) != null) {
if(Fight.getPlayerTeam(player) == Fight.getPlayerTeam(damager)) {
event.setCancelled(true);
damager.sendMessage(FightSystem.PREFIX + "§cDu darfst deinen Teamkollegen keinen Schaden machen!");
damager.sendMessage(FightSystem.PREFIX + "§cDu darfst deinen Teamkollegen keinen Schaden zufügen!");
}
} else
event.setCancelled(true);
return;
}
if(event.getDamager() instanceof Arrow) {
}else if(event.getDamager() instanceof Arrow) {
Arrow damagerArrow = (Arrow) event.getDamager();
if(!(damagerArrow.getShooter() instanceof Player)) {
return;
@ -42,12 +38,10 @@ public class EntityDamageByEntityListener implements Listener {
Player damager = (Player) damagerArrow.getShooter();
if(Fight.getPlayerTeam(player) == Fight.getPlayerTeam(damager)) {
event.setCancelled(true);
damager.sendMessage(FightSystem.PREFIX + "§cDu darfst deinen Teamkollegen keinen Schaden machen!");
damager.sendMessage(FightSystem.PREFIX + "§cDu darfst deinen Teamkollegen keinen Schaden zufügen!");
damagerArrow.setFireTicks(0);
player.setFireTicks(0);
}
return;
}
}
}
}

2
src/me/yaruma/fightsystem/listener/EntityExplodeListener.java
Datei anzeigen

@ -1,6 +1,7 @@
package me.yaruma.fightsystem.listener;
import me.yaruma.fightsystem.FightSystem;
import me.yaruma.fightsystem.fight.FightState;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.event.EventHandler;
@ -11,6 +12,7 @@ public class EntityExplodeListener implements Listener {
@EventHandler
public void handleEntityExplode(EntityExplodeEvent event) {
if(FightSystem.getPlugin().getFightState() != FightState.RUNNING) return;
for(Block block : event.blockList()) {
if(block.getType() != Material.WATER || block.getType() != Material.STATIONARY_WATER)
FightSystem.getPlugin().getWaterRemover().add(block.getLocation());

6
src/me/yaruma/fightsystem/listener/PlayerChatListener.java
Datei anzeigen

@ -12,7 +12,7 @@ import org.bukkit.event.player.PlayerChatEvent;
public class PlayerChatListener implements Listener {
FileManager fileManager = FightSystem.getPlugin().getFileManager();
private final FileManager fileManager = FightSystem.getPlugin().getFileManager();
@EventHandler
public void handlePlayerChat(PlayerChatEvent event) {
@ -29,10 +29,10 @@ public class PlayerChatListener implements Listener {
if(message.startsWith(teamChatDetection)) {
fightTeam.broadcast(prefixColorCode + player.getName() + "» " + prefixColorCode + message.substring(1));
} else {
Bukkit.broadcastMessage(prefixColorCode + teamName + " " + player.getName() + " §8» §7" + message);
Bukkit.broadcastMessage(prefixColorCode + teamName + " " + player.getName() + "§8» §7" + message);
}
}else{
Bukkit.broadcastMessage("§7" + player.getName() + " §8» §7" + message);
Bukkit.broadcastMessage("§7" + player.getName() + "§8» §7" + message);
}
event.setCancelled(true);

6
src/me/yaruma/fightsystem/listener/PlayerDeathListener.java
Datei anzeigen

@ -3,9 +3,9 @@ package me.yaruma.fightsystem.listener;
import me.yaruma.fightsystem.FightSystem;
import me.yaruma.fightsystem.fight.Fight;
import me.yaruma.fightsystem.fight.FightTeam;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent;
@ -13,13 +13,13 @@ public class PlayerDeathListener implements Listener {
FightSystem instance = FightSystem.getPlugin();
@EventHandler
@EventHandler(priority = EventPriority.HIGH)
public void handlePlayerDeath(PlayerDeathEvent event) {
Player player = event.getEntity().getPlayer();
if(Fight.getPlayerTeam(player) == null) return;
FightTeam fightTeam = Fight.getPlayerTeam(player);
fightTeam.getFightPlayer(player).setOut(true);
event.setDeathMessage(FightSystem.PREFIX + "§cDer Spieler §6" + player.getName() + " §cist gestorben!");
fightTeam.getFightPlayer(player).setOut(true);
}

2
src/me/yaruma/fightsystem/listener/PlayerInteractListener.java
Datei anzeigen

@ -17,7 +17,7 @@ import org.bukkit.inventory.meta.ItemMeta;
public class PlayerInteractListener implements Listener {
FileManager fileManager = FightSystem.getPlugin().getFileManager();
FightSystem instance = FightSystem.getPlugin();
private final FightSystem instance = FightSystem.getPlugin();
@EventHandler
public void handlePlayerInteract(PlayerInteractEvent event) {

4
src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
Datei anzeigen

@ -19,8 +19,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
public class PlayerJoinListener implements Listener {
FightSystem instance = FightSystem.getPlugin();
FileManager fileManager = instance.getFileManager();
private final FightSystem instance = FightSystem.getPlugin();
private final FileManager fileManager = instance.getFileManager();
@EventHandler
public void handlePlayerJoin(PlayerJoinEvent event) {

9
src/me/yaruma/fightsystem/listener/PlayerMoveListener.java
Datei anzeigen

@ -14,8 +14,8 @@ import org.bukkit.event.player.PlayerMoveEvent;
public class PlayerMoveListener implements Listener {
FightSystem instance = FightSystem.getPlugin();
FileManager fileManager = FightSystem.getPlugin().getFileManager();
private final FightSystem instance = FightSystem.getPlugin();
private final FileManager fileManager = FightSystem.getPlugin().getFileManager();
@EventHandler
public void handlePlayerMove(PlayerMoveEvent event) {
@ -56,10 +56,7 @@ public class PlayerMoveListener implements Listener {
}
}else if(fightTeam != null && !instance.isEntern()){
player.teleport(from);
if (fightTeam == Fight.blueTeam)
player.sendMessage(FightSystem.PREFIX + "§cDu darfst nicht zu Team " + fileManager.getStringFromConfig("Output.TeamRedColor") + fileManager.getStringFromConfig("Output.TeamRedName") + " §c!");
else
player.sendMessage(FightSystem.PREFIX + "§cDu darfst nicht zu Team " + fileManager.getStringFromConfig("Output.TeamBlueColor") + fileManager.getStringFromConfig("Output.TeamBlueName") + " §c!");
player.sendMessage(FightSystem.PREFIX + "§cDu darfst nicht zu " + Fight.getOpposite(fightTeam).getPrefix() + Fight.getOpposite(fightTeam).getName() + "§c!");
}
}
}

5
src/me/yaruma/fightsystem/listener/PlayerQuitListener.java
Datei anzeigen

@ -6,7 +6,6 @@ import me.yaruma.fightsystem.fight.FightState;
import me.yaruma.fightsystem.fight.FightTeam;
import me.yaruma.fightsystem.utils.countdown.Countdown;
import me.yaruma.fightsystem.utils.countdown.FinishNoPlayersOnline;
import me.yaruma.fightsystem.utils.countdown.FinishSpectateOver;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -26,8 +25,8 @@ public class PlayerQuitListener implements Listener {
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cDer Spieler §6" + player.getName() + " §chat den Kampf verlassen!");
if(fightTeam.allPlayersOut() && FightSystem.getPlugin().getFightState() == FightState.SETUP) {
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cAlle Spieler aus dem Team von §6" + fightTeam.getLeader().getPlayer() + " §chaben den Kampf verlassen! \n §4Stoppe Server in 30 Sekunden...");
Countdown countdown = new Countdown(30*20, new FinishNoPlayersOnline());
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cAlle Spieler aus dem Team " + fightTeam.getPrefix() + fightTeam.getName() + " §chaben den Kampf verlassen!");
Countdown countdown = new Countdown(30, new FinishNoPlayersOnline());
countdown.startTimer(FightSystem.getPlugin());
}
}

2
src/me/yaruma/fightsystem/listener/PlayerRespawnListener.java
Datei anzeigen

@ -9,7 +9,7 @@ import org.bukkit.event.player.PlayerRespawnEvent;
public class PlayerRespawnListener implements Listener {
FightSystem instance = FightSystem.getPlugin();
private final FightSystem instance = FightSystem.getPlugin();
@EventHandler
public void handlePlayerRespawn(PlayerRespawnEvent event) {

10
src/me/yaruma/fightsystem/manager/FileManager.java
Datei anzeigen

@ -4,16 +4,12 @@ import me.yaruma.fightsystem.FightSystem;
import java.io.File;
import java.io.IOException;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.FileConfigurationOptions;
public class FileManager
{
public File file;
public FileConfiguration config;
private final File file;
private final FileConfiguration config;
public FileManager(FightSystem instance) {
this.config = instance.getConfig();
@ -55,7 +51,7 @@ public class FileManager
return this.config;
}
public void save() {
private void save() {
try {
this.config.save(this.file);
}

4
src/me/yaruma/fightsystem/utils/ItemBuilder.java
Datei anzeigen

@ -10,8 +10,8 @@ import org.bukkit.inventory.meta.ItemMeta;
public class ItemBuilder {
private ItemStack item;
private ItemMeta meta;
private final ItemStack item;
private final ItemMeta meta;
public ItemBuilder(Material matrial) {
item = new ItemStack(matrial);

7
src/me/yaruma/fightsystem/utils/Region.java
Datei anzeigen

@ -1,7 +1,6 @@
package me.yaruma.fightsystem.utils;
import org.bukkit.Location;
import org.bukkit.entity.Player;
public class Region {
@ -17,7 +16,7 @@ public class Region {
return isIn2DRegion(location, minX, minZ, minX + xRange, minZ + zRange, margin);
}
public static boolean isIn2DRegion(Location location, int minX, int minZ, int maxX, int maxZ, int margin){
private static boolean isIn2DRegion(Location location, int minX, int minZ, int maxX, int maxZ, int margin){
return inRange(location.getBlockX(), minX, maxX, margin) && inRange(location.getBlockZ(), minZ, maxZ, margin);
}
@ -25,11 +24,11 @@ public class Region {
return inRange(location.getBlockX(), minX, maxX) && inRange(location.getBlockZ(), minZ, maxZ);
}
public static boolean inRange(double value, int min, int max, int margin){
private static boolean inRange(double value, int min, int max, int margin){
return inRange(value, min-margin, max+margin);
}
public static boolean inRange(double value, int min, int max){
private static boolean inRange(double value, int min, int max){
return min <= value && value <= max;
}
}

26
src/me/yaruma/fightsystem/utils/countdown/Countdown.java
Datei anzeigen

@ -8,36 +8,32 @@ import java.util.ArrayList;
public class Countdown {
private static ArrayList<Countdown> countdowns = new ArrayList<>();
private static final ArrayList<Countdown> countdowns = new ArrayList<>();
private int time;
private CountdownCallback countdownCallback;
private final CountdownCallback countdownCallback;
private int taskID;
public Countdown(int time, CountdownCallback countdownCallback) {
this.time = time;
this.countdownCallback = countdownCallback;
countdowns.add(this);
if(countdownCallback instanceof FinishTimeOver) FightSystem.getPlugin().fightTime = time;
}
public void startTimer(FightSystem plugin) {
BukkitScheduler bukkitScheduler = Bukkit.getServer().getScheduler();
this.taskID = bukkitScheduler.scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
this.taskID = bukkitScheduler.scheduleSyncRepeatingTask(plugin, () -> {
switch (time) {
case 600: case 300:
Bukkit.broadcastMessage("§6Noch §a" + time / 60 + " §6Minuten " + countdownCallback.countdownCounting());
case 900: case 600: case 300: case 180: case 120:
Bukkit.broadcastMessage(FightSystem.PREFIX + "§7Noch §a" + time / 60 + " §7Minuten " + countdownCallback.countdownCounting());
break;
case 60: case 30: case 20: case 15: case 10: case 5: case 4: case 3: case 2:
Bukkit.broadcastMessage("§6Noch §a" + time + " §6Sekunden " + countdownCallback.countdownCounting());
Bukkit.broadcastMessage(FightSystem.PREFIX + "§7Noch §a" + time + " §7Sekunden " + countdownCallback.countdownCounting());
break;
case 1:
Bukkit.broadcastMessage("§6Noch §aeine §6Sekunde " + countdownCallback.countdownCounting());
Bukkit.broadcastMessage(FightSystem.PREFIX + "§7Noch §aeine §7Sekunde " + countdownCallback.countdownCounting());
break;
case 0:
cancelTimer();
@ -45,18 +41,18 @@ public class Countdown {
break;
}
time--;
}
if(countdownCallback instanceof FinishTimeOver) FightSystem.getPlugin().fightTime = time;
}, 0, 20);
}
public void cancelTimer() {
private void cancelTimer() {
try {
Bukkit.getScheduler().cancelTask(this.taskID);
countdowns.remove(this);
} catch (AssertionError ex) {
ex.printStackTrace();
}
countdowns.remove(this);
}
public static void cancelAllTimers() {
@ -72,7 +68,7 @@ public class Countdown {
}
}
public CountdownType getType() {
private CountdownType getType() {
return countdownCallback.getType();
}
}

2
src/me/yaruma/fightsystem/utils/countdown/CountdownCallback.java
Datei anzeigen

@ -1,6 +1,6 @@
package me.yaruma.fightsystem.utils.countdown;
public interface CountdownCallback {
interface CountdownCallback {
String countdownCounting();
void countdownFinished();

2
src/me/yaruma/fightsystem/utils/countdown/CountdownType.java
Datei anzeigen

@ -7,7 +7,7 @@ public enum CountdownType {
PRE_RUNNING,
SETUP_OVER,
SPECTATE_OVER,
TIME_OVER;
TIME_OVER
}

1
src/me/yaruma/fightsystem/utils/countdown/FinishNoPlayersOnline.java
Datei anzeigen

@ -11,7 +11,6 @@ public class FinishNoPlayersOnline implements CountdownCallback {
@Override
public void countdownFinished() {
Bukkit.broadcastMessage("§aStoppe Server...");
Bukkit.getServer().shutdown();
}

2
src/me/yaruma/fightsystem/utils/countdown/FinishNoneEntern.java
Datei anzeigen

@ -13,7 +13,7 @@ public class FinishNoneEntern implements CountdownCallback {
@Override
public void countdownFinished() {
FightSystem.getPlugin().entern = true;
Bukkit.broadcastMessage("§aEntern ist nun erlaubt!");
Bukkit.broadcastMessage(FightSystem.PREFIX + "§aEntern ist nun erlaubt!");
}
@Override

1
src/me/yaruma/fightsystem/utils/countdown/FinishPreRunning.java
Datei anzeigen

@ -2,7 +2,6 @@ package me.yaruma.fightsystem.utils.countdown;
import me.yaruma.fightsystem.FightSystem;
import me.yaruma.fightsystem.manager.FileManager;
import org.bukkit.Bukkit;
public class FinishPreRunning implements CountdownCallback {

3
src/me/yaruma/fightsystem/utils/countdown/FinishSetupOver.java
Datei anzeigen

@ -1,5 +1,6 @@
package me.yaruma.fightsystem.utils.countdown;
import me.yaruma.fightsystem.FightSystem;
import org.bukkit.Bukkit;
public class FinishSetupOver implements CountdownCallback {
@ -11,7 +12,7 @@ public class FinishSetupOver implements CountdownCallback {
@Override
public void countdownFinished() {
Bukkit.broadcastMessage("Fight wird abgebrochen! \n Stoppe Server...");
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cKampf wird abgebrochen!");
Bukkit.getServer().shutdown();
}

1
src/me/yaruma/fightsystem/utils/countdown/FinishSpectateOver.java
Datei anzeigen

@ -11,7 +11,6 @@ public class FinishSpectateOver implements CountdownCallback {
@Override
public void countdownFinished() {
Bukkit.broadcastMessage("§aStoppe Server...");
Bukkit.getServer().shutdown();
}

2
src/me/yaruma/fightsystem/utils/countdown/FinishTimeOver.java
Datei anzeigen

@ -12,7 +12,7 @@ public class FinishTimeOver implements CountdownCallback {
@Override
public void countdownFinished() {
Bukkit.broadcastMessage("§aZeit abgelaufen! Der Kampf ist vorbei...");
Bukkit.broadcastMessage(FightSystem.PREFIX +"§aZeit abgelaufen!");
FightSystem.getPlugin().setSpectateState(null);
}

37
src/me/yaruma/fightsystem/utils/scoreboard/Scoreboard.java
Datei anzeigen

@ -13,33 +13,31 @@ import org.bukkit.scoreboard.ScoreboardManager;
public class Scoreboard {
private ScoreboardManager scoreboardManager;
private org.bukkit.scoreboard.Scoreboard scoreboard;
private Objective objective;
private int taskID;
private final org.bukkit.scoreboard.Scoreboard scoreboard;
private final Objective objective;
public Scoreboard(FightSystem instance) {
this.scoreboardManager = Bukkit.getScoreboardManager();
this.scoreboard = this.scoreboardManager.getNewScoreboard();
ScoreboardManager scoreboardManager = Bukkit.getScoreboardManager();
this.scoreboard = scoreboardManager.getNewScoreboard();
this.objective = scoreboard.registerNewObjective("AAA", "BBB");
}
public void setAutoScoreboard(int delay, Player player) {
taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(FightSystem.getPlugin(), new Runnable() {
int taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(FightSystem.getPlugin(), new Runnable() {
private int index = 0;
@Override
public void run() {
FightTeam fightTeam = getIndexDisplay(index);
if(fightTeam != null) {
if (fightTeam != null) {
objective.unregister();
scoreboard.registerNewObjective("AAA", "BBB");
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
objective.setDisplayName("§6Info " + fightTeam.getPrefix() + fightTeam.getName());
objective.setDisplayName(fightTeam.getPrefix() + fightTeam.getName());
for(FightPlayer fp : fightTeam.getPlayers()) {
for (FightPlayer fp : fightTeam.getPlayers()) {
objective.getScore(fightTeam.getPrefix() + fp.getPlayer().getName()).setScore((int) fp.getPlayer().getHealth());
}
@ -51,11 +49,20 @@ public class Scoreboard {
scoreboard.registerNewObjective("AAA", "BBB");
objective.setDisplaySlot(DisplaySlot.SIDEBAR);
objective.setDisplayName("§6Fight Info");
objective.getScore("§7Zeit: §a" + FightSystem.getPlugin().getFightTime()).setScore(3);
if(Methods.isEnabled("Fight.Entern")) objective.getScore("§7Entern: " + (FightSystem.getPlugin().isEntern() ? "§aja" : "§cnein")).setScore(2);
if(Methods.isEnabled("WinConditions.PercentSystem")) objective.getScore("§eSchaden ROT: §c" + FightSystem.getPlugin().getDamageRed() + "%").setScore(1);
if(Methods.isEnabled("WinConditions.PercentSystem")) objective.getScore("§eSchaden BLAU: §c" + FightSystem.getPlugin().getGetDamageBlue() + "%").setScore(0);
objective.setDisplayName("§6Kampf");
if (Methods.isEnabled("WinConditions.Timeout")) {
int fightTime = FightSystem.getPlugin().getFightTime();
if (fightTime >= 60)
objective.getScore("§7Zeit: §a" + fightTime / 60 + "m " + fightTime % 60 + "s").setScore(3);
else
objective.getScore("§7Zeit: §a" + fightTime + "s").setScore(3);
}
if (Methods.isEnabled("WinConditions.Entern"))
objective.getScore("§7Entern: " + (FightSystem.getPlugin().isEntern() ? "§aja" : "§cnein")).setScore(2);
if (Methods.isEnabled("WinConditions.PercentSystem"))
objective.getScore("§eSchaden ROT: §c" + FightSystem.getPlugin().getDamageRed() + "%").setScore(1);
if (Methods.isEnabled("WinConditions.PercentSystem"))
objective.getScore("§eSchaden BLAU: §c" + FightSystem.getPlugin().getGetDamageBlue() + "%").setScore(0);
index = 0;
}
player.setScoreboard(scoreboard);

14
src/me/yaruma/fightsystem/winconditions/WinconditionAllDead.java
Datei anzeigen

@ -12,7 +12,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
public class WinconditionAllDead implements Listener {
FightSystem instance = FightSystem.getPlugin();
private final FightSystem instance = FightSystem.getPlugin();
@EventHandler
public void handlePlayerDeath(PlayerDeathEvent event) {
@ -20,12 +20,10 @@ public class WinconditionAllDead implements Listener {
Player player = event.getEntity().getPlayer();
if(Fight.getPlayerTeam(player) == null) return;
FightTeam fightTeam = Fight.getPlayerTeam(player);
FightTeam oppositeFightTeam = Fight.getOpposite(fightTeam);
if(fightTeam.allPlayersOut()) {
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cAlle Spieler aus dem Team von " + fightTeam.getLeader().getPlayer().getName() + " §csind gestorben oder haben den Kampf verlassen!");
instance.setSpectateState(oppositeFightTeam);
return;
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cDer letzte Spieler aus " + fightTeam.getPrefix() + fightTeam.getName() + " §cist gestorben!");
instance.setSpectateState(Fight.getOpposite(fightTeam));
}
}
@ -35,12 +33,10 @@ public class WinconditionAllDead implements Listener {
Player player = event.getPlayer();
if(Fight.getPlayerTeam(player) == null) return;
FightTeam fightTeam = Fight.getPlayerTeam(player);
FightTeam oppositeFightTeam = Fight.getOpposite(fightTeam);
if(fightTeam.allPlayersOut()) {
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cAlle Spieler aus dem Team von §6" + fightTeam.getLeader().getPlayer().getName() + " §csind gestorben oder haben den Kampf verlassen!");
instance.setSpectateState(oppositeFightTeam);
return;
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cDer letzte Spieler aus §6" + fightTeam.getPrefix() + fightTeam.getName() + " §chat den Kampf verlassen!");
instance.setSpectateState(Fight.getOpposite(fightTeam));
}
}

15
src/me/yaruma/fightsystem/winconditions/WinconditionCaptainDead.java
Datei anzeigen

@ -13,7 +13,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
public class WinconditionCaptainDead implements Listener {
FightSystem instance = FightSystem.getPlugin();
private final FightSystem instance = FightSystem.getPlugin();
FileManager fileManager = instance.getFileManager();
@EventHandler
@ -22,13 +22,10 @@ public class WinconditionCaptainDead implements Listener {
Player player = event.getEntity().getPlayer();
if(Fight.getPlayerTeam(player) == null) return;
FightTeam fightTeam = Fight.getPlayerTeam(player);
FightTeam oppositeFightTeam = Fight.getOpposite(fightTeam);
String team = Fight.getRedTeam().isPlayerLeader(player) ? "Red" : "Blue";
if(fightTeam.isPlayerLeader(player)) {
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cDer Leader von Team " + fileManager.getStringFromConfig("Output.Team" + team + "Color") + fileManager.getStringFromConfig("Output.Team" + team + "Name") + " §cist gestorben!");
instance.setSpectateState(oppositeFightTeam);
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cDer Leader von " + fightTeam.getPrefix() + fightTeam.getName() + " §cist gestorben!");
instance.setSpectateState(Fight.getOpposite(fightTeam));
return;
}
}
@ -39,12 +36,10 @@ public class WinconditionCaptainDead implements Listener {
Player player = event.getPlayer();
if(Fight.getPlayerTeam(player) == null) return;
FightTeam fightTeam = Fight.getPlayerTeam(player);
FightTeam oppositeFightTeam = Fight.getOpposite(fightTeam);
String team = Fight.getRedTeam().isPlayerLeader(player) ? "Red" : "Blue";
if(fightTeam.isPlayerLeader(player)) {
instance.setSpectateState(oppositeFightTeam);
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cDer Leader von " + fightTeam.getPrefix() + fightTeam.getName() + " §chat den Kampf verlassen!");
instance.setSpectateState(Fight.getOpposite(fightTeam));
return;
}
}

8
src/me/yaruma/fightsystem/winconditions/WinconditionEntern.java
Datei anzeigen

@ -3,18 +3,18 @@ package me.yaruma.fightsystem.winconditions;
import me.yaruma.fightsystem.FightSystem;
import me.yaruma.fightsystem.manager.FileManager;
import me.yaruma.fightsystem.utils.countdown.Countdown;
import me.yaruma.fightsystem.utils.countdown.FinishTimeOver;
import me.yaruma.fightsystem.utils.countdown.FinishNoneEntern;
public class WinconditionEntern {
private static FightSystem instance = FightSystem.getPlugin();
private static FileManager fileManager = instance.getFileManager();
private static final FightSystem instance = FightSystem.getPlugin();
private static final FileManager fileManager = instance.getFileManager();
public static void entern() {
if(!Methods.isEnabled("WinConditions.Entern")) return;
int timeTimeOver = fileManager.getIntegerFromConfig("WinConditionParams.EnterPhaseBegin");
Countdown countdownTimeOver = new Countdown(timeTimeOver, new FinishTimeOver());
Countdown countdownTimeOver = new Countdown(timeTimeOver, new FinishNoneEntern());
countdownTimeOver.startTimer(instance);
}

10
src/me/yaruma/fightsystem/winconditions/WinconditionPercentSystem.java
Datei anzeigen

@ -12,13 +12,13 @@ import org.bukkit.event.entity.EntityExplodeEvent;
public class WinconditionPercentSystem implements Listener {
public static int team1DestroyedBlocks;
public static int team2DestroyedBlocks;
private static int team1DestroyedBlocks;
private static int team2DestroyedBlocks;
FightSystem instance = FightSystem.getPlugin();
FileManager fileManager = instance.getFileManager();
private final FightSystem instance = FightSystem.getPlugin();
private final FileManager fileManager = instance.getFileManager();
private static int schematicSize =
private static final int schematicSize =
Math.abs(
FightSystem.getPlugin().getFileManager().getIntegerFromConfig("Arena.Schemsize.x") *
FightSystem.getPlugin().getFileManager().getIntegerFromConfig("Arena.Schemsize.y") *

4
src/me/yaruma/fightsystem/winconditions/WinconditionTimeout.java
Datei anzeigen

@ -7,8 +7,8 @@ import me.yaruma.fightsystem.utils.countdown.FinishTimeOver;
public class WinconditionTimeout {
private static FightSystem instance = FightSystem.getPlugin();
private static FileManager fileManager = instance.getFileManager();
private static final FightSystem instance = FightSystem.getPlugin();
private static final FileManager fileManager = instance.getFileManager();
public static void timeout() {
if(!Methods.isEnabled("WinConditions.Timeout")) return;

0
plugin.yml → src/plugin.yml
Datei anzeigen