Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix invisibility potion compatibility with 1.8.8 #704

Merged
merged 1 commit into from
Mar 5, 2023
Merged

fix invisibility potion compatibility with 1.8.8 #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 93 additions & 9 deletions bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/BwSidebar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -367,6 +368,7 @@ private void handlePlayerList() {
/**
* Handle given player in sidebar owner tab list.
* Will remove existing tab and give a new one based on game conditions list like spectator, team red, etc.
* Will handle invisibility potion as well.
*/
public void giveUpdateTabFormat(@NotNull Player player, boolean skipStateCheck) {
// if sidebar was not created
Expand Down Expand Up @@ -481,9 +483,28 @@ public void giveUpdateTabFormat(@NotNull Player player, boolean skipStateCheck)
throw new RuntimeException("Wtf dude");
}

String tabName = TEAM_PREFIX+Base64.getEncoder().encodeToString((team.getName()).getBytes(StandardCharsets.UTF_8));
if (tabName.length() > 16) {
tabName = tabName.substring(0, 16);
String tabName = this.getTabName(team);
String tabNameInvisible = tabName = tabName.substring(0, tabName.length() >= 16 ? 15 : tabName.length());
tabNameInvisible += "^!";

if (player.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
if (!team.isMember(getPlayer())) {
// remove player from its tab group (if team tab group)
PlayerTab teamTab = tabList.getOrDefault(tabName, null);
if (null != teamTab) {
teamTab.remove(player);

// create or get tab group for the invisible players in that team
// set tab group name visibility to false
// identifier for invisibility
tabName = tabNameInvisible;
}
}
} else {
PlayerTab invTab = tabList.getOrDefault(tabNameInvisible, null);
if (null != invTab) {
invTab.remove(player);
}
}

PlayerTab teamTab = tabList.get(tabName);
Expand All @@ -500,16 +521,28 @@ public void giveUpdateTabFormat(@NotNull Player player, boolean skipStateCheck)

teamTab = handle.playerTabCreate(tabName, null, prefix, suffix, PlayerTab.PushingRule.PUSH_OTHER_TEAMS);
tabList.put(tabName, teamTab);
if (player.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
teamTab.setNameTagVisibility(PlayerTab.NameTagVisibility.NEVER);
}
}

teamTab.add(player);

// todo this should be outside. we are basically sending the player header and footer in sidebar holder's language
SidebarManager.getInstance().sendHeaderFooter(
player, lang.m(Messages.FORMATTING_SIDEBAR_TAB_HEADER_PLAYING),
lang.m(Messages.FORMATTING_SIDEBAR_TAB_FOOTER_PLAYING)
);
}

private @NotNull String getTabName(@NotNull ITeam team) {
String tabName = TEAM_PREFIX + Base64.getEncoder().encodeToString((team.getName()).getBytes(StandardCharsets.UTF_8));
if (tabName.length() > 16) {
tabName = tabName.substring(0, 16);
}
return tabName;
}

@NotNull
private SidebarLine getTabText(String path, Player targetPlayer, @Nullable HashMap<String, String> replacements) {
List<String> strings = Language.getList(getPlayer(), path);
Expand Down Expand Up @@ -646,17 +679,68 @@ public String getLine() {
/**
* Hide player name tag on head when he drinks an invisibility potion.
* This is required because not all clients hide it automatically.
*
* @param toggle true when applied, false when expired.
*/
public void handleInvisibilityPotion(@NotNull Player player, boolean toggle) {
if (toggle) {
// handle.remove(player);
// handle.playerListHideNameTag(player);
//todo the new sidebar does not provide a solution for invisibility potion?!!
} else {
if (null == arena) {
throw new RuntimeException("This can only be used when the player is in arena");
}
this.giveUpdateTabFormat(player, false);
// if (toggle) {
//
// ITeam playerTeam = arena.getTeam(player);
//
// // foreach enemy sidebar
// for (Player inGame : arena.getPlayers()) {
// if (playerTeam != null && !playerTeam.isMember(inGame)) {
// ISidebar sidebar = SidebarService.getInstance().getSidebar(inGame);
// if (sidebar instanceof BwSidebar) {
//
// // remove player from its tab group (if team tab group)
// PlayerTab teamTab = ((BwSidebar) sidebar).tabList.getOrDefault(getTabName(playerTeam), null);
// if (null != teamTab) {
// teamTab.remove(player);
// // create a new tab group for the invisible player
// // set tab group name visibility to false
// PlayerTab playerTab = sidebar.getHandle().playerTabCreate(player.getName(), null,
// new SidebarLine() {
// @Override
// public @NotNull String getLine() {
// return "";
// }
// },
// new SidebarLine() {
// @Override
// public @NotNull String getLine() {
// return "";
// }
// }, PlayerTab.PushingRule.NEVER
// );
// playerTab.setNameTagVisibility(PlayerTab.NameTagVisibility.NEVER);
// } else {
// // if player has personal tab list
// PlayerTab personalTab = ((BwSidebar) sidebar).tabList.getOrDefault(playerTeam.getName(), null);
// if (null != personalTab) {
// personalTab.setNameTagVisibility(PlayerTab.NameTagVisibility.NEVER);
// }
// }
// }
// }
// }
//
//
//// handle.remove(player);
//// handle.playerListHideNameTag(player);
// //todo the new sidebar does not provide a solution for invisibility potion?!!
// } else {
// foreach enemy sidebar
// get player tab group from enemy sidebar
// add player to tab group

// this.giveUpdateTabFormat(player, false);
// handle.playerListRestoreNameTag(player);
}
// }
}

public Sidebar getHandle() {
Expand Down