Skip to content

Commit 2ae0003

Browse files
committed
fix(forge): formatting & NPE
1 parent 610a765 commit 2ae0003

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

forge/src/main/java/com/envyful/wonder/trade/forge/data/WonderTradeManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@ private boolean shouldBroadcast(Pokemon newPoke) {
177177
}
178178

179179
private String getFormattedLine(EnvyPlayer<EntityPlayerMP> player, Pokemon newPoke, String line) {
180-
return UtilChatColour.translateColourCodes('&', UtilPlaceholder.replaceIdentifiers(player.getParent(), line)
180+
return UtilChatColour.translateColourCodes('&', UtilPlaceholder.replaceIdentifiers(player.getParent(), line
181181
.replace("%is_shiny%", newPoke.isShiny() ? this.mod.getLocale().getShinyReplacement() : "")
182182
.replace("%is_ultra_beast%", newPoke.isShiny() ? this.mod.getLocale().getUltraBeastReplacement() : "")
183183
.replace("%is_legend%", newPoke.isShiny() ? this.mod.getLocale().getLegendReplacement() : "")
184-
.replace("%pokemon%", newPoke.getSpecies().getPokemonName())
184+
.replace("%pokemon%", newPoke.getSpecies().getPokemonName()))
185185
);
186186
}
187187
}

forge/src/main/java/com/envyful/wonder/trade/forge/ui/PokemonSelectUI.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public static void openUI(EnvyPlayer<EntityPlayerMP> player) {
135135
.title("WonderTrade")
136136
.height(5)
137137
.setPlayerManager(WonderTradeForge.getInstance().getPlayerManager())
138+
.setCloseConsumer(envyPlayer -> {})
138139
.build()
139140
.open(player);
140141
}

0 commit comments

Comments
 (0)