Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Cleanup code

Browse Source
This commit is contained in:
Lixfel
2025-01-01 12:56:49 +01:00
parent f52cec0448
commit d64e32eaa5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
+9 -7
View File
@@ -23,7 +23,6 @@ import de.steamwar.lobby.LobbySystem;
import de.steamwar.lobby.display.NPC; import de.steamwar.lobby.display.NPC;
import de.steamwar.lobby.listener.BasicListener; import de.steamwar.lobby.listener.BasicListener;
import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserPerm;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
@@ -135,6 +134,10 @@ public class TeamPlayer extends BasicListener {
return false; return false;
} }
private String parseRandomMessage(Player player, SteamwarUser target, String message) throws MissingResourceException {
return LobbySystem.getMessage().parsePrefixed(message + random.nextInt(6), player, target.getUserName(), target.prefix().getColorCode() + target.prefix().getChatPrefix());
}
@EventHandler @EventHandler
public void onPlayerInteractEntity(PlayerInteractEntityEvent event) { public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
if (!(event.getRightClicked() instanceof Villager)) { if (!(event.getRightClicked() instanceof Villager)) {
@@ -144,14 +147,13 @@ public class TeamPlayer extends BasicListener {
players.remove(event.getPlayer()); players.remove(event.getPlayer());
return; return;
} }
SteamwarUser user = SteamwarUser.get(event.getRightClicked().getName());
UserPerm.Prefix prefix = user.prefix(); SteamwarUser target = SteamwarUser.get(event.getRightClicked().getName());
Object[] parameters = new Object[]{event.getRightClicked().getName(),prefix.getColorCode() + prefix.getChatPrefix()};
String message; String message;
try { try {
message = LobbySystem.getMessage().parsePrefixed("NPC_CHAT_" + user.getId() + "_" + random.nextInt(6), event.getPlayer(),parameters); message = parseRandomMessage(event.getPlayer(), target, "NPC_CHAT_" + target.getId() + "_");
} catch (Exception e) { } catch (MissingResourceException e) {
message = LobbySystem.getMessage().parsePrefixed("NPC_CHAT_" + random.nextInt(6), event.getPlayer(),parameters); message = parseRandomMessage(event.getPlayer(), target, "NPC_CHAT_");
} }
event.getPlayer().sendMessage(message); event.getPlayer().sendMessage(message);
} }