updated nametag hiders #28
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
lgtm except that if statement, i’ll simplify it down when i get the chance |
|
|
||
| @SubscribeEvent | ||
| public void onEntityRenderer(RenderLivingEvent.Pre<EntityLivingBase> event) { | ||
| final LocrawInformation locraw = HytilsReborn.INSTANCE.getLocrawUtil().getLocrawInformation(); | ||
| if (HytilsConfig.hideUselessArmorStands && EssentialAPI.getMinecraftUtil().isHypixel() && HytilsReborn.INSTANCE.getLobbyChecker().playerIsInLobby() || (HytilsConfig.hideUselessArmorStandsSkyblock && locraw != null && locraw.getGameType() == GameType.SKYBLOCK)) { | ||
| if (HytilsConfig.hideUselessArmorStands && EssentialAPI.getMinecraftUtil().isHypixel() && HytilsReborn.INSTANCE.getLobbyChecker().playerIsInLobby() || (HytilsConfig.hideUselessArmorStandsGame && locraw != null && locraw.getGameType() == GameType.SKYBLOCK) || (HytilsConfig.hideUselessArmorStandsGame && locraw != null && locraw.getGameType() == GameType.BED_WARS) || (HytilsConfig.hideUselessArmorStandsGame && locraw != null && locraw.getGameType() == GameType.SKY_WARS) || (HytilsConfig.hideUselessArmorStandsGame && locraw != null && locraw.getGameMode().contains("BRIDGE"))) { |
There was a problem hiding this comment.
Suggested change
| if (HytilsConfig.hideUselessArmorStands && EssentialAPI.getMinecraftUtil().isHypixel() && HytilsReborn.INSTANCE.getLobbyChecker().playerIsInLobby() || (HytilsConfig.hideUselessArmorStandsGame && locraw != null && locraw.getGameType() == GameType.SKYBLOCK) || (HytilsConfig.hideUselessArmorStandsGame && locraw != null && locraw.getGameType() == GameType.BED_WARS) || (HytilsConfig.hideUselessArmorStandsGame && locraw != null && locraw.getGameType() == GameType.SKY_WARS) || (HytilsConfig.hideUselessArmorStandsGame && locraw != null && locraw.getGameMode().contains("BRIDGE"))) { | |
| if (EssentialAPI.getMinecraftUtil().isHypixel() && locraw != null && (HytilsReborn.INSTANCE.getLobbyChecker().playerIsInLobby() && HytilsConfig.hideUselessArmorStands) || (HytilsConfig.hideUselessArmorStandsGame && (locraw.getGameType() == GameType.SKYBLOCK || locraw.getGameType() == GameType.BED_WARS || locraw.getGameType() == GameType.SKY_WARS || locraw.getGameMode().contains("BRIDGE"))) { |
Did this in Notepad++ so not 100% sure if it's right, but I think it is. Regardless of where you are on Hypixel, you should always have a locraw, so might as well check that in the beginning and not have to check it for each individual locraw check. Then we can just group up the config option and all possible game(types/modes) together.
|
also the list of nametags should probably be moved to datastorage but that doesn't have to happen in this pr |
|
if im not mistaken, with the current if statement, it wont work anywhere, since it's checking if the player is in the lobby and in one of the gametypes/modes. the lobby feature and game feature are part of the same && and need to be separated |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
= changed Hide Useless SkyBlock Nametags to Hide Useless Game Nametags and added support for BedWars, SkyWars and (Bridge) Duels
= added support for WoolWars in GameStartingTitles
= updated some config names/descriptions
removed HideBridgeGoal Nametags