Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-23 01:27:33 +01:00
Code Issues Projects Releases Wiki Activity

Invert talk item pattern check to avoid null comparison

Browse Source
This commit is contained in:
fullwall 2024-06-23 09:51:13 +08:00
parent 20ea3e8723
commit 7bc0d82de7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/net/citizensnpcs/trait/text/Text.java
View File

@ -141,7 +141,7 @@ public class Text extends Trait implements Runnable, Listener {
private void onRightClick(NPCRightClickEvent event) {
if (!event.getNPC().equals(npc) || text.size() == 0)
return;
String localPattern = itemInHandPattern.equals("default") ? Setting.TALK_ITEM.asString() : itemInHandPattern;
String localPattern = "default".equals(itemInHandPattern) ? Setting.TALK_ITEM.asString() : itemInHandPattern;
if (Util.matchesItemInHand(event.getClicker(), localPattern) && !shouldTalkClose()) {
talk(event.getClicker());
event.setDelayedCancellation(true);