Skip to content

Commit

Permalink
Move more messages to new language system
Browse files Browse the repository at this point in the history
Almighty-Satan committed Jan 18, 2025
1 parent d1f772d commit 07835bf
Showing 17 changed files with 123 additions and 156 deletions.
15 changes: 6 additions & 9 deletions src/main/java/de/cuuky/varo/bot/discord/BotRegister.java
Original file line number Diff line number Diff line change
@@ -13,15 +13,16 @@
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;

import de.varoplugin.cfw.configuration.YamlConfigurationUtil;
import de.cuuky.varo.Main;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.player.VaroPlayer;
import de.varoplugin.cfw.configuration.YamlConfigurationUtil;
import io.github.almightysatan.slams.Placeholder;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;

// TODO Rework this shit
public class BotRegister {

/*
@@ -76,10 +77,6 @@ public int getCode() {
return this.code;
}

public String getKickMessage(VaroPlayer vp) {
return ConfigMessages.BOTS_DISCORD_NOT_REGISTERED_DISCORD.getValue(vp, vp).replace("%code%", String.valueOf(getCode()));
}

public Member getMember() {
try {
Guild guild = Main.getBotLauncher().getDiscordbot().getMainGuild();
@@ -175,7 +172,7 @@ private static void loadAll() {

Player player = Bukkit.getPlayer(UUID.fromString(uuid));
if (player != null && !reg.isActive())
kickPlayerLater(player, reg.getKickMessage(VaroPlayer.getPlayer(player)));
kickPlayerLater(player, Messages.PLAYER_KICK_DISCORD_NOT_REGISTERED.value(Placeholder.constant("discord-code", String.valueOf(reg.getCode()))));
}
} catch (SQLException e) {
e.printStackTrace();
@@ -204,7 +201,7 @@ private static void loadAll() {

Player player = Bukkit.getPlayer(UUID.fromString(uuid));
if (player != null && !reg.isActive())
kickPlayerLater(player, reg.getKickMessage(VaroPlayer.getPlayer(player)));
kickPlayerLater(player, Messages.PLAYER_KICK_DISCORD_NOT_REGISTERED.value(Placeholder.constant("discord-code", String.valueOf(reg.getCode()))));
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/de/cuuky/varo/command/varo/DiscordCommand.java
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String l
if (args.length == 1) {
if (!reg.isActive()) {
Messages.COMMANDS_VARO_DISCORD_STATUS_INACTIVE.send(sender);
sender.sendMessage(reg.getKickMessage(vp));
sender.sendMessage(Messages.PLAYER_KICK_DISCORD_NOT_REGISTERED.value(Placeholder.constant("discord-code", String.valueOf(reg.getCode()))));
} else {
Messages.COMMANDS_VARO_DISCORD_STATUS_ACTIVE.send(sender);
Messages.COMMANDS_VARO_DISCORD_VERIFY_ACCOUNT.send(sender, Placeholder.constant("target", reg.getMember().getNickname()));
@@ -141,7 +141,7 @@ public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String l

Player target = Bukkit.getPlayerExact(reg.getPlayerName());
if (target != null)
Bukkit.getPlayerExact(reg.getPlayerName()).kickPlayer(reg.getKickMessage(VaroPlayer.getPlayer(target)));
Bukkit.getPlayerExact(reg.getPlayerName()).kickPlayer(Messages.PLAYER_KICK_DISCORD_NOT_REGISTERED.value(Placeholder.constant("discord-code", String.valueOf(reg.getCode()))));
} else if (args[0].equalsIgnoreCase("bypassRegister") || args[0].equalsIgnoreCase("bypass")) {
if (!ConfigSetting.DISCORDBOT_VERIFYSYSTEM.getValueAsBoolean()) {
Messages.COMMANDS_VARO_DISCORD_VERIFY_DISABLED.send(sender);
6 changes: 3 additions & 3 deletions src/main/java/de/cuuky/varo/config/language/Contexts.java
Original file line number Diff line number Diff line change
@@ -62,11 +62,11 @@ public Player getPlayer() {
}
}

class KillContext extends PlayerContext {
class KillContext extends DeathContext {
private final VaroPlayer killer;

public KillContext(VaroPlayer player, VaroPlayer killer) {
super(player);
public KillContext(VaroPlayer player, VaroPlayer killer, String reason) {
super(player, reason);
this.killer = killer;
}

28 changes: 27 additions & 1 deletion src/main/java/de/cuuky/varo/config/language/Messages.java
Original file line number Diff line number Diff line change
@@ -103,6 +103,17 @@ public final class Messages {
public static final VaroMessage PLAYER_JOIN_MASS_RECORDING = message("player.join.massrecording");
public static final VaroMessage PLAYER_JOIN_REMAINING_TIME = message("player.join.remainingTime");

public static final VaroMessage PLAYER_DISCONNECT_BROADCAST = message("player.disconnect.broadcast");
public static final VaroMessage PLAYER_DISCONNECT_SESSION_END = message("player.disconnect.eliminated");
public static final VaroMessage PLAYER_DISCONNECT_SPECTATOR = message("player.disconnect.spectator");
public static final VaroMessage PLAYER_DISCONNECT_TOO_OFTEN = message("player.disconnect.quitTooOften");
public static final VaroMessage PLAYER_DISCONNECT_WITH_REMAINING_TIME = message("player.disconnect.quitRemainingTime");
public static final VaroMessage PLAYER_DISCONNECT_KICK = message("player.disconnect.kick");
public static final VaroMessage PLAYER_DISCONNECT_KICK_DELAY_OVER = message("player.disconnect.delay");
public static final VaroMessage PLAYER_DISCONNECT_KICK_IN_SECONDS = message("player.disconnect.kickInSeconds");
public static final VaroMessage PLAYER_DISCONNECT_KICK_PLAYER_NEARBY = message("player.disconnect.noKickPlayerNearby");
public static final VaroMessage PLAYER_DISCONNECT_KICK_SERVER_CLOSE_SOON = message("player.disconnect.serverCloseSoon");

public static final VaroMessage PLAYER_KICK_DEATH = message("player.kick.death");
public static final VaroMessage PLAYER_KICK_KILL = message("player.kick.kill");
public static final VaroMessage PLAYER_KICK_NOT_USER_OF_PROJECT = message("player.kick.notUserOfProject");
@@ -117,7 +128,18 @@ public final class Messages {
public static final VaroMessage PLAYER_KICK_MASS_REC_SESSION_OVER = message("player.kick.kickMessageMassRec");
public static final VaroMessage PLAYER_KICK_TOO_MANY_STRIKES = message("player.kick.tooManyStrikes");
public static final VaroMessage PLAYER_KICK_COMMAND = message("player.kick.command");

public static final VaroMessage PLAYER_KICK_DISCORD_NOT_REGISTERED = message("player.kick.notRegisteredDiscord");
public static final VaroMessage PLAYER_KICK_DISCORD_NO_USER = message("player.kick.noDiscordUser");

public static final VaroMessage PLAYER_DEATH_ELIMINATED_OTHER = message("player.death.eliminated.other");
public static final VaroMessage PLAYER_DEATH_ELIMINATED_PLAYER = message("player.death.eliminated.player");
public static final VaroMessage PLAYER_DEATH_LIFE_OTHER = message("player.death.teamLifeLost.other");
public static final VaroMessage PLAYER_DEATH_LIFE_PLAYER = message("player.death.teamLifeLost.player");
public static final VaroMessage PLAYER_DEATH_RESPAWN_PROTECTION = message("player.death.respawnProtection");
public static final VaroMessage PLAYER_DEATH_RESPAWN_PROTECTION_OVER = message("player.death.respawnProtectionOver");
public static final VaroMessage PLAYER_DEATH_KILL_LIFE_ADD = message("player.death.killLifeAdd");
public static final VaroMessage PLAYER_DEATH_KILL_TIME_ADD = message("player.death.killTimeAdd");

public static final VaroMessage PLAYER_MOVE_PROTECTION = message("player.moveProtection");
public static final VaroMessage PLAYER_SPECTATOR_HEIGHT = message("player.spectator.height");
public static final VaroMessage PLAYER_CRAFTING_DISALLOWED = message("player.crafting.disallowed");
@@ -127,6 +149,10 @@ public final class Messages {
public static final VaroMessageArray PLAYER_ACTIONBAR = array("player.actionbar");
public static final VaroMessageArray2d PLAYER_TABLIST_HEADER = array2d("player.tablist.header");
public static final VaroMessageArray2d PLAYER_TABLIST_FOOTER = array2d("player.tablist.footer");
public static final VaroMessage PLAYER_TABLIST_FORMAT = message("player.tablist.footer");

public static final VaroMessage PLAYER_NAMETAG_PREFIX = message("player.nametag.prefix");
public static final VaroMessage PLAYER_NAMETAG_SUFFIX = message("player.nametag.suffix");

public static final VaroMessage CHAT_DEFAULT = message("chat.default");
public static final VaroMessage CHAT_TEAM = message("chat.team");
Original file line number Diff line number Diff line change
@@ -8,9 +8,6 @@

public enum ConfigMessages implements DefaultLanguage {

BOTS_DISCORD_NOT_REGISTERED_DISCORD("bots.notRegisteredDiscord", "&cDu bist noch nicht mit Discord verifiziert!\n&7Nutze &c/verify %code% &7um dich auf unserem Discord zu verifizieren!\nLink zum Discord: &c%discordLink%"),
BOTS_DISCORD_NO_SERVER_USER("bots.noServerUser", "&cDein Account ist nicht auf dem Discord!%nextLine%&7Joine dem Discord und versuche es erneut."),

COMBAT_FRIENDLY_FIRE("combat.friendlyfire", "&7Dieser Spieler ist in deinem Team!"),
COMBAT_IN_FIGHT("combat.inFight", "&7Du bist nun im Kampf, logge dich &4NICHT &7aus!"),
COMBAT_LOGGED_OUT("combat.loggedOut", "&c%player% &7hat den Server während eines Kampfes verlassen!"),
@@ -21,41 +18,16 @@ public enum ConfigMessages implements DefaultLanguage {
SPAWN_DISTANCE("spawn.spawnDistance", "&7Du bist %colorcode%%distance% &7Blöcke vom Spawn entfernt!"),
SPAWN_DISTANCE_NETHER("spawn.spawnDistanceNether", "&7Du bist %colorcode%%distance% &7Blöcke vom Portal zur Oberwelt entfernt!"),

DEATH_ELIMINATED_OTHER("death.eliminated.other", "%colorcode%%player% &7ist gestorben. Grund: &c%reason%"),
DEATH_ELIMINATED_PLAYER("death.eliminated.player", "%colorcode%%player% &7wurde von %colorcode%%killer% &7getötet!"),
DEATH_LIFE_OTHER("death.teamLifeLost.other", "%colorcode%%player% &7ist gestorben und hat nun noch %colorcode%%teamLifes% &7Teamleben! Grund: &c%reason%"),
DEATH_LIFE_PLAYER("death.teamLifeLost.player", "%colorcode%%player% &7wurde von %colorcode%%killer% &7getötet und hat nun noch %colorcode%%teamLifes% &7Teamleben! Grund: &c%reason%"),
DEATH_RESPAWN_PROTECTION("death.respawnProtection", "&c%player% hat nun ein Leben weniger und ist für %seconds% unverwundbar!"),
DEATH_RESPAWN_PROTECTION_OVER("death.respawnProtectionOver", "&c%player% ist nun wieder verwundbar!"),
DEATH_KILL_LIFE_ADD("death.killLifeAdd", "Dein Team hat aufgrund eines Kills ein Teamleben erhalten!"),
DEATH_KILL_TIME_ADD("death.killTimeAdd", "Aufgrund deines Kills hast du zusätzlich %colorcode%%timeAdded% &7Sekunden Zeit erhalten!"),

GAME_VARO_START("game.start.varoStart", "%projectname% &7wurde gestartet! &5Viel Erfolg!"),
GAME_VARO_START_TITLE("game.start.startTitle", "%colorcode%%countdown%"),
GAME_VARO_START_SUBTITLE("game.start.startSubtitle", "&7Viel Glück!"),
GAME_WIN("game.win.single", "&5%player% &7hat %projectname% &7gewonnen! &5Gratulation!"),
GAME_WIN_TEAM("game.win.team", "&5%winnerPlayers% &7haben %projectname% &7gewonnen! &5Gratulation!"),

QUIT_MESSAGE("quitmessage.quit", "%prefix%&c%player%&7 hat den Server verlassen!"),
QUIT_DISCONNECT_SESSION_END("quitmessage.disconnectKilled", "&c%player% &7hat das Spiel verlassen und ist seit &c%banTime% &7Minute(n) nicht mehr online.%nextLine%&7Damit ist er aus %projectname% &7ausgeschieden!"),
QUIT_SPECTATOR("quitmessage.spectator", "&c%player% &7hat den Server als Spectator verlassen!"),
QUIT_TOO_OFTEN("quitmessage.quitTooOften", "&c%player% &7hat den Server zu oft verlassen und dadurch seine Sitzung verloren."),
QUIT_WITH_REMAINING_TIME("quitmessage.quitRemainingTime", "%prefix%&c%player% &7hat den Server vorzeitig verlassen!"),
QUIT_KICK_BROADCAST("quitmessage.broadcast", "%colorcode%%player% &7wurde gekickt!"),
QUIT_KICK_DELAY_OVER("quitmessage.protectionOver", "%colorcode%%player% &7wurde aufgrund seines Todes jetzt gekickt!"),
QUIT_KICK_IN_SECONDS("quitmessage.kickInSeconds", "%colorcode%%player% &7wird in %colorcode%%countdown% &7Sekunde(n) gekickt!"),
QUIT_KICK_PLAYER_NEARBY("quitmessage.noKickPlayerNearby", "&cEs befindet sich ein Spieler &4%distance% &cBlöcke in deiner Nähe!%nextLine%&7Um gekickt zu werden, entferne dich von diesem Spieler!"),
QUIT_KICK_SERVER_CLOSE_SOON("quitmessage.serverCloseSoon", "&7Der Server schliesst in &c%minutes% &7Minuten!"),

SERVER_MODT_CANT_JOIN_HOURS("motd.cantJoinHours", "&cDu kannst nur zwischen &4%minHour% &cund &4%maxHour%&c Uhr joinen! %nextLine%&7Versuche es später erneut! &7%currHour%&7:&7%currMin%&7:&7%currSec%"),
SERVER_MODT_NOT_OPENED("motd.serverNotOpened", "&cDer Server wurde noch nicht für alle geöffnet! %nextLine%&7Versuche es später erneut!"),
SERVER_MODT_OPEN("motd.serverOpen", "&aSei nun bei %projectname% &adabei! \n&7Viel Spass!"),

NAMETAG_PREFIX_NO_TEAM("nametag.prefix.noTeam", "&7"),
NAMETAG_PREFIX_TEAM("nametag.prefix.team", "%colorcode%%team% &7"),
NAMETAG_SUFFIX_NO_TEAM("nametag.suffix.noTeam", "&c %kills%"),
NAMETAG_SUFFIX_TEAM("nametag.suffix.team", "&c %kills%"),

CHEST_NOT_TEAM_CHEST("chest.notTeamChest", "&7Diese Kiste gehört %colorcode%%player%&7!"),
CHEST_NOT_TEAM_FURNACE("chest.notTeamFurnace", "&7Dieser Ofen gehört %colorcode%%player%&7!"),
CHEST_REMOVED_SAVEABLE("chest.removedChest", "&7Du hast diese/n %saveable% %colorcode%erfolgreich &7entfernt!"),
@@ -78,11 +50,6 @@ public enum ConfigMessages implements DefaultLanguage {
SORT_SPECTATOR_TELEPORT("sort.spectatorTeleport", "Du wurdest, da du Spectator bist, zum Spawn teleportiert!"),
SORT_SORTED("sort.sorted", "&7Du wurdest in das Loch %colorcode%%zahl% &7teleportiert!"),

TABLIST_PLAYER_WITH_TEAM("tablist.player.withTeam", "%colorcode%%team% &8| &7%player% &c%kills%"),
TABLIST_PLAYER_WITH_TEAM_RANK("tablist.player.withTeamAndRank", "&7%rank% &8| %colorcode%%team% &8| &7%player% &c%kills%"),
TABLIST_PLAYER_WITHOUT_TEAM("tablist.player.withoutTeam", "&7%player% &c%kills%"),
TABLIST_PLAYER_WITHOUT_TEAM_RANK("tablist.player.withoutTeamWithRank", "&7%rank% &8| &7%player% &c%kills%"),

SPAWNS_SPAWN_NUMBER("spawns.spawnNameTag.number", "&7Spawn %colorcode%%number%"),
SPAWNS_SPAWN_PLAYER("spawns.spawnNameTag.player", "&7Spawn von %colorcode%%player%"),

Original file line number Diff line number Diff line change
@@ -4,9 +4,6 @@

public enum LanguageEN implements LoadableMessage {

BOTS_DISCORD_NOT_REGISTERED_DISCORD("bots.notRegisteredDiscord", "&cYour account is not verified!\n&7Please use &c/verify %code% &7to verify your Discord account!\nLink: &c%discordLink%"),
BOTS_DISCORD_NO_SERVER_USER("bots.noServerUser", "&cYour account is not on the discord!%nextLine%&7Join the discord and try again."),

COMBAT_FRIENDLY_FIRE("combat.friendlyfire", "&7This player is on your team!"),
COMBAT_IN_FIGHT("combat.inFight", "&7You are now in combat, do &4NOT &7log &7out!"),
COMBAT_LOGGED_OUT("combat.loggedOut", "&c%player% &7has left the server during a fight!"),
@@ -16,42 +13,17 @@ public enum LanguageEN implements LoadableMessage {
SPAWN_NETHER("spawn.spawnNether", "%colorcode%Coordinates&7 of the portal to the world: %colorcode%%x%&7, %colorcode%%y%&7, %colorcode%%z%"),
SPAWN_DISTANCE("spawn.spawnDistance", "&7You are %colorcode%%distance% &7blocks away from spawn!"),
SPAWN_DISTANCE_NETHER("spawn.spawnDistanceNether", "&7You are %colorcode%%distance% &7blocks away from the portal to the world!"),

DEATH_ELIMINATED_OTHER("death.eliminated.other", "%colorcode%%player% &7died. Reason: &c%reason%"),
DEATH_ELIMINATED_PLAYER("death.eliminated.player", "%colorcode%%player% &7was killed by %colorcode%%killer%&7!"),
DEATH_LIFE_OTHER("death.teamLifeLost.other", "%colorcode%%player% &7died! They now have %colorcode%%teamLifes% &7life/lives left! Reason: &c%reason%"),
DEATH_LIFE_PLAYER("death.teamLifeLost.player", "%colorcode%%player% &7was killed by %colorcode%%killer%&7! They now have %colorcode%%teamLifes% &7life/lives left! Reason: &c%reason%"),
DEATH_RESPAWN_PROTECTION("death.respawnProtection", "&c%player% now has one life less and is invulnerable for %seconds% seconds!"),
DEATH_RESPAWN_PROTECTION_OVER("death.respawnProtectionOver", "&c%player% is now vulnerable again!"),
DEATH_KILL_LIFE_ADD("death.killLifeAdd", "&7Your team got a team life because of a kill!"),
DEATH_KILL_TIME_ADD("death.killTimeAdd", "You've recieved %colorcode%%timeAdded% &7seconds of additional time!"),

GAME_VARO_START("game.start.varoStart", "%projectname% &7has started! &5Good luck!"),
GAME_VARO_START_TITLE("game.start.startTitle", "%colorcode%%countdown%"),
GAME_VARO_START_SUBTITLE("game.start.startSubtitle", "&7Good luck!"),
GAME_WIN("game.win.single", "&5%player% &7has won %projectname%&7! &5Congratulations!"),
GAME_WIN_TEAM("game.win.team", "&5%winnerPlayers% &7 have won %projectname% &7! &5Congratulations!"),

QUIT_MESSAGE("quitmessage.quit", "%prefix%&c%player%&7 has left the server!"),
QUIT_DISCONNECT_SESSION_END("quitmessage.disconnectKilled", "&c%player% &7has left the game and is no longer online since &c%banTime% &7minute(s).%nextLine%&7This means he has been removed from %projectname% &7!"),
QUIT_SPECTATOR("quitmessage.spectator", "&c%player% &7has left the server as a spectator!"),
QUIT_TOO_OFTEN("quitmessage.quitTooOften", "&c%player% &7has left the server too often and thus lost their session."),
QUIT_WITH_REMAINING_TIME("quitmessage.quitRemainingTime", "%prefix%&c%player% &7has left the server early!"),
QUIT_KICK_BROADCAST("quitmessage.broadcast", "%colorcode%%player% &7has been kicked!"),
QUIT_KICK_DELAY_OVER("quitmessage.protectionOver", "%colorcode%%player% &7was kicked because of their death now!"),
QUIT_KICK_IN_SECONDS("quitmessage.kickInSeconds", "%colorcode%%player% &7will be kicked in %colorcode%%countdown% &7second(s)!"),
QUIT_KICK_PLAYER_NEARBY("quitmessage.noKickPlayerNearby", "&cThere is a player &4%distance% &cblocks near you!%nextLine%&7To get kicked, move away from this player!"),
QUIT_KICK_SERVER_CLOSE_SOON("quitmessage.serverCloseSoon", "&7The server closes in &c%minutes% &7minutes!"),

SERVER_MODT_CANT_JOIN_HOURS("motd.cantJoinHours", "&cYou can only join between &4%minHour% &cand &4%maxHour%&c o'clock! %nextLine%&7Please try again later! &7%currHour%&7:&7%currMin%&7:&7%currSec%"),
SERVER_MODT_NOT_OPENED("motd.serverNotOpened", "&cThe server has not yet been opened for everyone! %nextLine%&7Try again later!"),
SERVER_MODT_OPEN("motd.serverOpen", "&aBe now with us in %projectname%&a!\n&7Have fun!"),

NAMETAG_PREFIX_NO_TEAM("nametag.prefix.noTeam", "&7"),
NAMETAG_PREFIX_TEAM("nametag.prefix.team", "%colorcode%%team% &7"),
NAMETAG_SUFFIX_NO_TEAM("nametag.suffix.noTeam", "&c %kills%"),
NAMETAG_SUFFIX_TEAM("nametag.suffix.team", "&c %kills%"),

CHEST_NOT_TEAM_CHEST("chest.notTeamChest", "&7This chest belongs to %colorcode%%player%&7!"),
CHEST_NOT_TEAM_FURNACE("chest.notTeamFurnace", "&7This furnace belongs to %colorcode%%player%&7!"),
CHEST_REMOVED_SAVEABLE("chest.removedChest", "&7You have removed this %saveable% %colorcode%successfully"),
@@ -74,11 +46,6 @@ public enum LanguageEN implements LoadableMessage {
SORT_SPECTATOR_TELEPORT("sort.spectatorTeleport", "&7You've been teleported to the world spawn because you're a spectator!"),
SORT_SORTED("sort.sorted", "&7You've been teleported to spawn %colorcode%%number%&7!"),

TABLIST_PLAYER_WITH_TEAM("tablist.player.withTeam", "%colorcode%%team% &8| &7%player% &c%kills%"),
TABLIST_PLAYER_WITH_TEAM_RANK("tablist.player.withTeamAndRank", "&7%rank% &8| %colorcode%%team% &8| &7%player% &c%kills%"),
TABLIST_PLAYER_WITHOUT_TEAM("tablist.player.withoutTeam", "&7%player% &c%kills%"),
TABLIST_PLAYER_WITHOUT_TEAM_RANK("tablist.player.withoutTeamWithRank", "&7%rank% &8| &7%player% &c%kills%"),

SPAWNS_SPAWN_NUMBER("spawns.spawnNameTag.number", "&7Spawn %colorcode%%number%"),
SPAWNS_SPAWN_PLAYER("spawns.spawnNameTag.player", "&7Spawn of %colorcode%%player%"),

Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
import de.cuuky.varo.Main;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.event.VaroEvent;
import de.cuuky.varo.event.VaroEventType;
import de.cuuky.varo.logger.logger.EventLogger.LogType;
@@ -97,7 +96,7 @@ public void onDisable() {
vp.getStats().setCountdown(1);
} else {
vp.setMassRecordingKick(true);
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_BROADCAST, vp);
Messages.PLAYER_DISCONNECT_KICK.broadcast(vp);
vp.onEvent(BukkitEventType.KICKED);
Messages.PLAYER_KICK_MASS_REC_SESSION_OVER.kick(vp);
}
12 changes: 6 additions & 6 deletions src/main/java/de/cuuky/varo/game/VaroMainHeartbeatThread.java
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@
import de.cuuky.varo.Main;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.event.VaroEvent;
import de.cuuky.varo.event.VaroEventType;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.player.event.BukkitEventType;
import de.cuuky.varo.player.stats.stat.PlayerState;
import io.github.almightysatan.slams.Placeholder;

public class VaroMainHeartbeatThread extends BukkitRunnable {

@@ -43,7 +43,7 @@ public void run() {
if (secondsToClose % 60 == 0) {
int minutesToClose = secondsToClose / 60;
if (minutesToClose == 10 || minutesToClose == 5 || minutesToClose == 3 || minutesToClose == 2 || minutesToClose == 1)
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_SERVER_CLOSE_SOON).replace("%minutes%", String.valueOf(minutesToClose));
Messages.PLAYER_DISCONNECT_KICK_IN_SECONDS.broadcast(Placeholder.constant("server-close", String.valueOf(minutesToClose)));

if (!Main.getDataManager().getOutsideTimeChecker().canJoin()) {
for (VaroPlayer vp : (ArrayList<VaroPlayer>) VaroPlayer.getOnlinePlayer().clone()) {
@@ -70,19 +70,19 @@ public void run() {

if (countdown == 30 || countdown == 10 || countdown == 5 || countdown == 4 || countdown == 3 || countdown == 2 || countdown == 1 || countdown == 0) {
if (countdown == 0 && !VaroEvent.getEvent(VaroEventType.MASS_RECORDING).isEnabled()) {
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_BROADCAST, vp);
Messages.PLAYER_DISCONNECT_KICK.broadcast(vp);
vp.onEvent(BukkitEventType.KICKED);
Messages.PLAYER_KICK_SESSION_OVER.kick(vp);
continue;
}
if (countdown == 1) {
if (!vp.canBeKicked(noKickDistance)) {
vp.sendMessage(ConfigMessages.QUIT_KICK_PLAYER_NEARBY).replace("%distance%", String.valueOf(ConfigSetting.NO_KICK_DISTANCE.getValueAsInt()));
Messages.PLAYER_DISCONNECT_KICK_PLAYER_NEARBY.send(vp);
countdown += 1;
} else
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_IN_SECONDS, vp).replace("%countdown%", (countdown == 1) ? "einer" : String.valueOf(countdown));
Messages.PLAYER_DISCONNECT_KICK_IN_SECONDS.broadcast(vp, Placeholder.constant("kick-delay", String.valueOf(countdown)));
} else
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_IN_SECONDS, vp).replace("%countdown%", (countdown == 1) ? "einer" : String.valueOf(countdown));
Messages.PLAYER_DISCONNECT_KICK_IN_SECONDS.broadcast(vp, Placeholder.constant("kick-delay", String.valueOf(countdown)));
}

vp.getStats().setCountdown(countdown);
32 changes: 16 additions & 16 deletions src/main/java/de/cuuky/varo/listener/PlayerDeathListener.java
Original file line number Diff line number Diff line change
@@ -11,27 +11,27 @@
import de.cuuky.varo.config.language.Contexts;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.listener.helper.cancelable.CancelableType;
import de.cuuky.varo.listener.helper.cancelable.VaroCancelable;
import de.cuuky.varo.logger.logger.EventLogger.LogType;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.player.event.BukkitEventType;
import de.cuuky.varo.player.stats.stat.PlayerState;
import io.github.almightysatan.slams.Placeholder;

public class PlayerDeathListener implements Listener {

private void kickDeadPlayer(VaroPlayer deadPlayer, VaroPlayer killerPlayer) {
private void kickDeadPlayer(VaroPlayer deadPlayer, VaroPlayer killerPlayer, String cause) {
new BukkitRunnable() {
@Override
public void run() {
if (!deadPlayer.isOnline())
return;

if (killerPlayer == null)
Messages.PLAYER_KICK_DEATH.kick(deadPlayer);
Messages.PLAYER_KICK_DEATH.kick(deadPlayer, new Contexts.DeathContext(deadPlayer, cause));
else
Messages.PLAYER_KICK_KILL.kick(deadPlayer, new Contexts.KillContext(deadPlayer, killerPlayer));
Messages.PLAYER_KICK_KILL.kick(deadPlayer, new Contexts.KillContext(deadPlayer, killerPlayer, cause));
}
}.runTaskLater(Main.getInstance(), 1L);
}
@@ -57,17 +57,17 @@ public void onPlayerDeath(PlayerDeathEvent event) {
if (deadP.getTeam() == null || deadP.getTeam().getLifes() - 2D < -0.00000001D) {
if (killerPlayer == null) {
Messages.LOG_DEATH_ELIMINATED_OTHER.log(LogType.DEATH, new Contexts.DeathContext(deadP, cause));
Main.getLanguageManager().broadcastMessage(ConfigMessages.DEATH_ELIMINATED_OTHER, deadP).replace("%death%", deadPlayer.getName()).replace("%reason%", cause);
Messages.PLAYER_DEATH_ELIMINATED_OTHER.broadcast(new Contexts.DeathContext(deadP, cause));
} else {
Messages.LOG_DEATH_ELIMINATED_PLAYER.log(LogType.KILL, new Contexts.KillContext(deadP, killer));
Main.getLanguageManager().broadcastMessage(ConfigMessages.DEATH_ELIMINATED_PLAYER, deadP).replace("%death%", deadPlayer.getName()).replace("%killer%", killerPlayer.getName()).replace("%killerkills%", String.valueOf(killer.getStats().getKills()));
Messages.LOG_DEATH_ELIMINATED_PLAYER.log(LogType.KILL, new Contexts.KillContext(deadP, killer, cause));
Messages.PLAYER_DEATH_ELIMINATED_PLAYER.broadcast(new Contexts.KillContext(deadP, killer, cause));
}

deadP.onEvent(BukkitEventType.DEATH_NO_LIFES);

if (!ConfigSetting.PLAYER_SPECTATE_AFTER_DEATH.getValueAsBoolean()) {
if (ConfigSetting.KICK_DELAY_AFTER_DEATH.isIntActivated()) {
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_IN_SECONDS, deadP).replace("%countdown%", String.valueOf(ConfigSetting.KICK_DELAY_AFTER_DEATH.getValueAsInt()));
Messages.PLAYER_DISCONNECT_KICK_IN_SECONDS.broadcast(deadP, Placeholder.constant("kick-delay", String.valueOf(ConfigSetting.KICK_DELAY_AFTER_DEATH.getValueAsInt())));
deadP.getStats().setState(PlayerState.SPECTATOR, ConfigSetting.PLAYER_SHOW_DEATH_SCREEN.getValueAsBoolean());
deadP.update();
new BukkitRunnable() {
@@ -79,31 +79,31 @@ public void run() {
if (!deadP.isOnline())
return;

kickDeadPlayer(deadP, killer);
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_DELAY_OVER, deadP);
kickDeadPlayer(deadP, killer, cause);
Messages.PLAYER_DISCONNECT_KICK_DELAY_OVER.broadcast(deadP);
}
}
}.runTaskLater(Main.getInstance(), ConfigSetting.KICK_DELAY_AFTER_DEATH.getValueAsInt() * 20L);
} else
kickDeadPlayer(deadP, killer);
kickDeadPlayer(deadP, killer, cause);
} else {
deadP.getStats().setState(PlayerState.SPECTATOR, ConfigSetting.PLAYER_SHOW_DEATH_SCREEN.getValueAsBoolean());
deadP.update();
}
} else {
if (ConfigSetting.RESPAWN_PROTECTION.isIntActivated()) {
VaroCancelable prot = new VaroCancelable(CancelableType.PROTECTION, deadP, ConfigSetting.RESPAWN_PROTECTION.getValueAsInt());
Main.getLanguageManager().broadcastMessage(ConfigMessages.DEATH_RESPAWN_PROTECTION, deadP).replace("%seconds%", String.valueOf(ConfigSetting.RESPAWN_PROTECTION.getValueAsInt()));
prot.setTimerHook(() -> Main.getLanguageManager().broadcastMessage(ConfigMessages.DEATH_RESPAWN_PROTECTION_OVER, deadP));
Messages.PLAYER_DEATH_RESPAWN_PROTECTION.broadcast(deadP);
prot.setTimerHook(() -> Messages.PLAYER_DEATH_RESPAWN_PROTECTION_OVER.broadcast(deadP));
}

deadP.getTeam().setLifes(deadP.getTeam().getLifes() - 1);
if (killerPlayer == null) {
Messages.LOG_DEATH_LIFE_OTHER.log(LogType.DEATH, new Contexts.DeathContext(deadP, cause));
Main.getLanguageManager().broadcastMessage(ConfigMessages.DEATH_LIFE_OTHER, deadP).replace("%death%", deadPlayer.getName()).replace("%reason%", cause);
Messages.PLAYER_DEATH_LIFE_OTHER.broadcast(new Contexts.DeathContext(deadP, cause));
} else {
Messages.LOG_DEATH_LIFE_PLAYER.log(LogType.KILL, new Contexts.KillContext(deadP, killer));
Main.getLanguageManager().broadcastMessage(ConfigMessages.DEATH_LIFE_PLAYER, deadP).replace("%death%", deadPlayer.getName()).replace("%killer%", killerPlayer.getName()).replace("%killerkills%", String.valueOf(killer.getStats().getKills()));
Messages.LOG_DEATH_LIFE_PLAYER.log(LogType.KILL, new Contexts.KillContext(deadP, killer, cause));
Messages.PLAYER_DEATH_LIFE_PLAYER.broadcast(new Contexts.KillContext(deadP, killer, cause));
}
}
}
10 changes: 5 additions & 5 deletions src/main/java/de/cuuky/varo/listener/PlayerLoginListener.java
Original file line number Diff line number Diff line change
@@ -57,10 +57,10 @@ public void onPlayerLogin(PlayerLoginEvent event) {
if (reg == null) {
reg = new BotRegister(event.getPlayer().getUniqueId().toString(), true);
reg.setPlayerName(event.getPlayer().getName());
event.disallow(Result.KICK_OTHER, reg.getKickMessage(vp));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_DISCORD_NOT_REGISTERED.value(vp, Placeholder.constant("discord-code", String.valueOf(reg.getCode()))));
return;
} else if (!reg.isActive() && !reg.isBypass()) {
event.disallow(Result.KICK_OTHER, reg.getKickMessage(vp));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_DISCORD_NOT_REGISTERED.value(vp, Placeholder.constant("discord-code", String.valueOf(reg.getCode()))));
return;
}
}
@@ -72,11 +72,11 @@ public void onPlayerLogin(PlayerLoginEvent event) {
UserSnowflake userSnowflake = User.fromId(reg.getUserId());
if (userSnowflake == null || guild == null || !guild.isMember(userSnowflake)) {
if (!ConfigSetting.DISCORDBOT_VERIFYSYSTEM_OPTIONAL.getValueAsBoolean()) {
event.disallow(Result.KICK_OTHER, ConfigMessages.BOTS_DISCORD_NO_SERVER_USER.getValue(vp, vp));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_DISCORD_NO_USER.value(vp));
vp.setPlayer(null);
return;
} else
reg.delete();
}
reg.delete();
}
} catch (Exception e2) {
System.err.println("[Varo] Es wurde keine Server ID angegeben oder die ID des Spielers ist falsch!");
7 changes: 3 additions & 4 deletions src/main/java/de/cuuky/varo/listener/PlayerQuitListener.java
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@
import de.cuuky.varo.combatlog.CombatlogCheck;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.logger.logger.EventLogger.LogType;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.player.VaroPlayerDisconnect;
@@ -28,7 +27,7 @@ public void onPlayerQuit(PlayerQuitEvent event) {

// IF THEY WERE A SPECTATOR
if (vplayer.getStats().isSpectator() || vplayer.isAdminIgnore()) {
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_SPECTATOR, vplayer);
Messages.PLAYER_DISCONNECT_SPECTATOR.broadcast(vplayer);
vplayer.onEvent(BukkitEventType.QUIT);
return;
}
@@ -65,15 +64,15 @@ public void onPlayerQuit(PlayerQuitEvent event) {
}

VaroPlayerDisconnect.disconnected(vplayer);
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_WITH_REMAINING_TIME, vplayer);
Messages.PLAYER_DISCONNECT_WITH_REMAINING_TIME.broadcast(vplayer);
Messages.LOG_PLAYER_DC_TO_EARLY.log(LogType.JOIN_LEAVE, vplayer);
vplayer.onEvent(BukkitEventType.QUIT);
return;
}
}

vplayer.onEvent(BukkitEventType.QUIT);
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_MESSAGE, vplayer);
Messages.PLAYER_DISCONNECT_BROADCAST.broadcast(vplayer);
}

@EventHandler(priority = EventPriority.MONITOR)
29 changes: 4 additions & 25 deletions src/main/java/de/cuuky/varo/player/VaroPlayer.java
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@
import de.cuuky.varo.bot.discord.VaroDiscordBot;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.event.VaroEvent;
import de.cuuky.varo.event.VaroEventType;
import de.cuuky.varo.game.LobbyItem;
@@ -370,21 +369,9 @@ public void update() {

private String getTablistName() {
if (ConfigSetting.TABLIST_CHANGE_NAMES.getValueAsBoolean()) {
String listname = "";
if (this.getTeam() != null) {
if (this.getRank() == null) {
listname = ConfigMessages.TABLIST_PLAYER_WITH_TEAM.getValue(null, this);
} else {
listname = ConfigMessages.TABLIST_PLAYER_WITH_TEAM_RANK.getValue(null, this);
}
} else {
if (this.getRank() == null) {
listname = ConfigMessages.TABLIST_PLAYER_WITHOUT_TEAM.getValue(null, this);
} else {
listname = ConfigMessages.TABLIST_PLAYER_WITHOUT_TEAM_RANK.getValue(null, this);
}
}
String listname = Messages.PLAYER_TABLIST_FORMAT.value(this);

// max 16 characters on 1.7.10
if (ServerVersion.ONE_8.isHigherThan(VersionUtils.getVersion()) && listname.length() > 16)
listname = listname.substring(0, 16);

@@ -401,22 +388,14 @@ private String getNametagName() {
}

private String getNametagPrefix() {
String prefix = "";
if (this.team != null)
prefix = ConfigMessages.NAMETAG_PREFIX_TEAM.getValue(null, this);
if (this.team == null || prefix.length() > 16)
prefix = ConfigMessages.NAMETAG_PREFIX_NO_TEAM.getValue(null, this);
String prefix = Messages.PLAYER_NAMETAG_PREFIX.value(this);
if (prefix.length() > 16)
prefix = prefix.substring(0, 16);
return prefix;
}

private String getNametagSuffix() {
String suffix = "";
if (this.team != null)
suffix = ConfigMessages.NAMETAG_SUFFIX_TEAM.getValue(null, this);
if (this.team == null || suffix.length() > 16)
suffix = ConfigMessages.NAMETAG_SUFFIX_NO_TEAM.getValue(null, this);
String suffix = Messages.PLAYER_NAMETAG_SUFFIX.value(this);
if (suffix.length() > 16)
suffix = suffix.substring(0, 16);
return suffix;
5 changes: 2 additions & 3 deletions src/main/java/de/cuuky/varo/player/VaroPlayerDisconnect.java
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
import de.cuuky.varo.alert.AlertType;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.player.stats.stat.PlayerState;
import de.cuuky.varo.player.stats.stat.Strike;
import de.varoplugin.cfw.player.PlayerVersionAdapter;
@@ -72,7 +71,7 @@ public boolean check() {
vp.getStats().addStrike(new Strike("Der Server wurde zu oft verlassen.", vp, "CONSOLE"));

Messages.ALERT_DISCONNECT_TOO_OFTEN.alert(AlertType.DISCONNECT, vp);
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_TOO_OFTEN, vp);
Messages.PLAYER_DISCONNECT_TOO_OFTEN.broadcast(vp);
this.remove();
return true;
}
@@ -116,7 +115,7 @@ public void run() {

vp.getStats().removeCountdown();
vp.getStats().setState(PlayerState.DEAD);
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_DISCONNECT_SESSION_END, vp).replace("%banTime%", String.valueOf(ConfigSetting.BAN_AFTER_DISCONNECT_MINUTES.getValueAsInt()));
Messages.PLAYER_DISCONNECT_SESSION_END.broadcast(vp);
}
}.runTaskLater(Main.getInstance(), (ConfigSetting.BAN_AFTER_DISCONNECT_MINUTES.getValueAsInt() * 60L) * 20));
}
Original file line number Diff line number Diff line change
@@ -4,14 +4,15 @@

import de.cuuky.varo.Main;
import de.cuuky.varo.combatlog.PlayerHit;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.event.VaroEvent;
import de.cuuky.varo.event.VaroEventType;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.player.event.BukkitEvent;
import de.cuuky.varo.player.event.BukkitEventType;
import de.cuuky.varo.player.stats.Stats;
import io.github.almightysatan.slams.Placeholder;

public class KillEvent extends BukkitEvent {

@@ -34,7 +35,7 @@ public void onExec(VaroPlayer player) {

if (add > 0 && player.getTeam().getLifes() + add <= max) {
player.getTeam().setLifes(player.getTeam().getLifes() + add);
player.sendMessage(ConfigMessages.DEATH_KILL_LIFE_ADD);
Messages.PLAYER_DEATH_KILL_LIFE_ADD.send(player);
}
}

@@ -49,7 +50,7 @@ public void onExec(VaroPlayer player) {

if (timeAdded > 0) {
stats.setCountdown(timeAdded + stats.getCountdown());
player.sendMessage(Main.getPrefix() + ConfigMessages.DEATH_KILL_TIME_ADD.getValue(player).replace("%timeAdded%", String.valueOf(timeAdded)));
Messages.PLAYER_DEATH_KILL_TIME_ADD.send(player, Placeholder.constant("time-additional", String.valueOf(timeAdded)));
}
}

Original file line number Diff line number Diff line change
@@ -13,18 +13,17 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;

import de.varoplugin.cfw.version.ServerVersion;
import de.varoplugin.cfw.version.VersionUtils;
import de.cuuky.varo.Main;
import de.cuuky.varo.config.language.Contexts;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.logger.logger.EventLogger.LogType;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.player.event.BukkitEventType;
import de.cuuky.varo.player.stats.stat.inventory.InventoryBackup;
import de.cuuky.varo.serialize.identifier.VaroSerializeField;
import de.cuuky.varo.serialize.identifier.VaroSerializeable;
import de.varoplugin.cfw.version.ServerVersion;
import de.varoplugin.cfw.version.VersionUtils;

public class OfflineVillager implements VaroSerializeable {

@@ -84,7 +83,7 @@ public void run() {
}.runTaskLater(Main.getInstance(), 1L);
}

public void kill(VaroPlayer killer) {
public void kill(VaroPlayer killer, String cause) {
remove();

for (ItemStack it : backup.getAllContents())
@@ -93,8 +92,8 @@ public void kill(VaroPlayer killer) {
int exp = Math.min(this.backup.getExpLevel() * 7, 100); // See EntityHuman#getExpValue (1.8.8)
((ExperienceOrb) this.location.getWorld().spawnEntity(this.location, EntityType.EXPERIENCE_ORB)).setExperience(exp);

Messages.LOG_DEATH_ELIMINATED_PLAYER.log(LogType.KILL, new Contexts.KillContext(this.vp, killer));
Main.getLanguageManager().broadcastMessage(ConfigMessages.DEATH_ELIMINATED_PLAYER, vp).replace("%death%", vp.getName()).replace("%killer%", killer.getName());
Messages.LOG_DEATH_ELIMINATED_PLAYER.log(LogType.KILL, new Contexts.KillContext(this.vp, killer, cause));
Messages.PLAYER_DEATH_ELIMINATED_PLAYER.broadcast(new Contexts.KillContext(this.vp, killer, cause));

killer.onEvent(BukkitEventType.KILL);
this.vp.onEvent(BukkitEventType.DEATH);
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.cuuky.varo.player.stats.stat.offlinevillager;

import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -55,16 +56,18 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {

@EventHandler
public void onEntityDeath(EntityDeathEvent event) {
if (event.getEntity().getKiller() == null || !event.getEntity().getType().toString().contains("ZOMBIE"))
LivingEntity entity = event.getEntity();
if (entity.getKiller() == null || !entity.getType().toString().contains("ZOMBIE"))
return;

OfflineVillager vill = OfflineVillager.getVillager(event.getEntity());
OfflineVillager vill = OfflineVillager.getVillager(entity);
if (vill == null)
return;

event.setDroppedExp(0);
event.getDrops().clear();
vill.kill(VaroPlayer.getPlayer(event.getEntity().getKiller()));
String cause = entity.getLastDamageCause() != null ? entity.getLastDamageCause().getCause().toString() : "?";
vill.kill(VaroPlayer.getPlayer(entity.getKiller()), cause);
}

@EventHandler
35 changes: 33 additions & 2 deletions src/main/resources/en.yml
Original file line number Diff line number Diff line change
@@ -13,6 +13,17 @@ player:
spectator: "<prefix>§a<name>§7 has entered the server as a spectator!"
massrecording: "<prefix>§a<name>§7 has entered the server during mass recording and is vulnerable in <colorcode><config-Protections-joinProtectionTime>§7 seconds!"
remainingTime: "<prefix>§a<name>§7 left the server too early and has <colorcode><seconds>§7 seconds left! Remaining §cDisconnects§7: §c<remaining-disconnects>"
disconnect:
kick: "<prefix><colorcode><name> §7has been kicked!"
spectator: "<prefix>§c<name> §7has left the server as a spectator!"
broadcast: "<prefix>§c<name>§7 has left the server!"
eliminated: "<prefix>§c<name> §7has not been online for §c<config-Disconnect-banAfterDisconnectMinutes> §7minute(s).§7They have now been removed from <projectname>§7!"
serverCloseSoon: "<prefix>§7The server closes in §c<server-close> §7minutes!"
kickInSeconds: "<prefix><colorcode><name> §7will be kicked in <colorcode><kick-delay> §7second(s)!"
quitTooOften: "<prefix>§c<name> §7has left the server too often and thus lost their session."
quitRemainingTime: "<prefix>§c<name> §7has left the server early!"
noKickPlayerNearby: "<prefix>§cA player is less than §4<config-Other-noKickDistance> §cblocks away from you! §7Move away from this player to get kicked!"
delay: "<prefix><colorcode><name> §7has been kicked!"
kick:
death: "§cYou died!"
noSessionLeft: "§cYou have no more sessions left!\n§7Wait until tomorrow to play again!"
@@ -32,11 +43,27 @@ player:
kickMessageMassRec: "§cThe mass recording is finished, \n§7everybody got kicked!"
notStarted: "§cThe server has not been opened yet! \n§7Please be patient a little longer!"
serverFull: "§cThe server is full!\n§7Talk to the owner if this is a mistake!"
notRegisteredDiscord: |-
§7Your account is not verified!
§7Please use §c/verify <discord-code> §7to verify your Discord account!
Link: §c<discord>
noDiscordUser: "§7Your account is not on the discord server!\n§7Join the discord and try again!"
death:
teamLifeLost:
player: "<prefix><colorcode><name> §7was killed by <colorcode><killer-name>§7! They now have <colorcode><team-lives> §7life/lives left! Reason: §c<death-reason>"
other: "<prefix><colorcode><name> §7died! They now have <colorcode><team-lives> §7life/lives left! Reason: §c<death-reason>"
eliminated:
other: "<prefix><colorcode><name> §7died. Reason: §c<death-reason>"
player: "<prefix><colorcode><name> §7was killed by <colorcode><killer-name>§7!"
respawnProtectionOver: "<prefix>§c<name> is now vulnerable again!"
respawnProtection: "<prefix>§c<name> has lost a life and is invulnerable for <config-Death-respawnProtection> seconds!"
killLifeAdd: "<prefix>§7Your team got an additional team life!"
killTimeAdd: "<prefix>You've recieved <colorcode><time-additional> §7seconds of additional time!"
moveProtection: "<prefix>You cannot move until your <colorcode>protection§7 has expired!"
spectator:
height: "§cYou can not fly any lower!"
height: "<prefix>§cYou can not fly any lower!"
crafting:
disallowed: "§cYou are not allowed to craft, use or brew this item!"
disallowed: "<prefix>§cYou are not allowed to craft, use or brew this item!"
scoreboard:
title:
- "<projectname>"
@@ -95,6 +122,10 @@ player:
- "<colorcode><hour>§7:<colorcode><minute>§7:<colorcode><second>"
- " "
- "§7------------------------"
format: "<displayname> §c<kills>"
nametag:
prefix: "<if_ne:<team>:-:<colorcode><team>:> §7"
suffix: "§c <kills>"
chat:
default: "<displayname> §8» §f<message>"
team: "§7[<team>§7] <name> §8» §f<message>"

0 comments on commit 07835bf

Please sign in to comment.