Skip to content

Commit

Permalink
Optimization
Browse files Browse the repository at this point in the history 
Optimized yaml file searching
  • Loading branch information
@Ezzud
Ezzud authored Nov 26, 2021
1 parent ddd2ef2 commit b8ecf56
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 57 deletions.
2 changes: 1 addition & 1 deletion plugin.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Manhunt
main: fr.ezzud.hunting.Main
version: 1.4.0
version: 1.4.2
author: Ezzud
commands:
manhunt:
Expand Down
1 change: 1 addition & 0 deletions src/fr/ezzud/hunting/listeners/onEntityKill.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public onEntityKill(Main instance) {
public void EntityKill(EntityDeathEvent event) {
Entity entity = event.getEntity();
if (entity.getType().equals(EntityType.ENDER_DRAGON)) {
Main.GameState = false;
Bukkit.broadcastMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("prefix") + plugin.getConfig().getString("messages_enderdragon_win").replaceAll("%player%", plugin.getConfig().getString("hunted"))));
manhuntSpeedrunnerWinEvent winEvent = new manhuntSpeedrunnerWinEvent();
Bukkit.getPluginManager().callEvent(winEvent);
Expand Down
41 changes: 13 additions & 28 deletions src/fr/ezzud/hunting/listeners/onJoin.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package fr.ezzud.hunting.listeners;

import java.util.Iterator;
import java.util.List;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
Expand Down Expand Up @@ -28,28 +29,20 @@ public void onPlayerJoin(PlayerJoinEvent event) {
if(Main.GameState == true) {
Bukkit.broadcastMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("prefix") + plugin.getConfig().getString("joinMessage").replaceAll("%player%", p)));
Player player = event.getPlayer();
Iterator<?> team2Var = plugin.getConfig().getStringList("team2").iterator();

while(team2Var.hasNext()) {
String member = (String)team2Var.next();
if(member.equals(player.getName())) {
List<String> team2Var = plugin.getConfig().getStringList("team2");
if(team2Var.contains(player.getName())) {
player.setDisplayName(plugin.getConfig().getString("team2Color").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setPlayerListName(plugin.getConfig().getString("team2Color").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setGameMode(GameMode.SURVIVAL);
}
}


Iterator<?> team1Var = plugin.getConfig().getStringList("team1").iterator();

while(team1Var.hasNext()) {
String member = (String)team1Var.next();
if(member.equals(player.getName())) {
List<String> team1Var = plugin.getConfig().getStringList("team1");
if(team1Var.contains(player.getName())) {
player.setDisplayName(plugin.getConfig().getString("team1Color").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setPlayerListName(plugin.getConfig().getString("team1Color").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setGameMode(GameMode.SURVIVAL);
}
}

String teamHVar = plugin.getConfig().getString("hunted");
if(teamHVar.equals(player.getName())) {
Expand All @@ -58,27 +51,19 @@ public void onPlayerJoin(PlayerJoinEvent event) {
player.setGameMode(GameMode.SURVIVAL);
}

Iterator<?> teamGVar = plugin.getConfig().getStringList("guards").iterator();

while(teamGVar.hasNext()) {
String member = (String)teamGVar.next();
if(member.equals(player.getName())) {
player.setDisplayName(plugin.getConfig().getString("guardColor").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setPlayerListName(plugin.getConfig().getString("guardColor").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setGameMode(GameMode.SURVIVAL);
}
}
List<String> teamGVar = plugin.getConfig().getStringList("guards");
if(teamGVar.contains(player.getName())) {
player.setDisplayName(plugin.getConfig().getString("guardColor").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setPlayerListName(plugin.getConfig().getString("guardColor").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setGameMode(GameMode.SURVIVAL);
}


Iterator<?> teamSVar = plugin.getConfig().getStringList("spectators").iterator();

while(teamSVar.hasNext()) {
String member = (String)teamSVar.next();
if(member.equals(player.getName())) {
List<String> teamSVar = plugin.getConfig().getStringList("spectators");
if(teamSVar.contains(player.getName())) {
player.setDisplayName(plugin.getConfig().getString("spectatorColor").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setPlayerListName(plugin.getConfig().getString("spectatorColor").replaceAll("&", "§") + player.getName() + ChatColor.RESET);
player.setGameMode(GameMode.SPECTATOR);
}
}
} else {
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "spawnpoint " + p + " " + plugin.getConfig().getString("spawnCoords").split(", ")[0] + " " + plugin.getConfig().getString("spawnCoords").split(", ")[1] + " " + plugin.getConfig().getString("spawnCoords").split(", ")[2] );
Expand Down
44 changes: 16 additions & 28 deletions src/fr/ezzud/hunting/management/teamManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.ezzud.hunting.management;

import java.util.Iterator;
import java.util.List;

import fr.ezzud.hunting.Main;

Expand All @@ -13,44 +13,32 @@ public static boolean isTeam(String user) {
boolean isTeam = false;


Iterator<?> team1Var = plugin.getConfig().getStringList("team1").iterator();
List<String> team1Var = plugin.getConfig().getStringList("team1");

while(team1Var.hasNext()) {
String member = (String)team1Var.next();
if(member.equals(user)) {
return true;
}
if(team1Var.contains(user)) {
isTeam = true;
}

Iterator<?> team2Var = plugin.getConfig().getStringList("team2").iterator();

while(team2Var.hasNext()) {
String member = (String)team2Var.next();
if(member.equals(user)) {
isTeam = true;
}
List<String> team2Var = plugin.getConfig().getStringList("team2");

if(team2Var.contains(user)) {
isTeam = true;
}

String teamHVar = plugin.getConfig().getString("hunted");
if(teamHVar.equals(user)) {
isTeam = true;
}

Iterator<?> teamGVar = plugin.getConfig().getStringList("guards").iterator();

while(teamGVar.hasNext()) {
String member = (String)teamGVar.next();
if(member.equals(user)) {
isTeam = true;
}
List<String> teamGVar = plugin.getConfig().getStringList("guards");

if(teamGVar.contains(user)) {
isTeam = true;
}
Iterator<?> teamSVar = plugin.getConfig().getStringList("spectators").iterator();

while(teamSVar.hasNext()) {
String member = (String)teamSVar.next();
if(member.equals(user)) {
isTeam = true;
}
List<String> teamSVar = plugin.getConfig().getStringList("spectators");

if(teamSVar.contains(user)) {
isTeam = true;
}
return isTeam;
}
Expand Down

0 comments on commit b8ecf56

Please sign in to comment.