diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-09-01 18:36:17 +0100 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-09-01 18:36:17 +0100 |
| commit | 13f491acee3dfd675bf77a666722b2518dd54ab2 (patch) | |
| tree | a9a0a8e4bf0fd82af5d9f13db89d9307f1e35f13 /src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java | |
| parent | b1ee29a247058b5686ee13093c46659ac3f01685 (diff) | |
| parent | d0abbc5bda63dc777c660b703ffcfa4a81a41e1a (diff) | |
Merge branch '1.7.10' of https://github.com/sor1n/Modjam-Mod.git into 1.7.10
Conflicts:
build.gradle
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java')
| -rw-r--r-- | src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java index 9c5d7be..a083f57 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java @@ -87,7 +87,7 @@ public class GuiJewelryModifier extends GuiContainer { if (this.searchField.textboxKeyTyped(character, key)) {
int items = 0;
for (ItemStack item : JewelrycraftUtil.objects)
- if (item != null && searchField.getText() != "" && item.getItem() != null && item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())) items++;
+ if (item != null && searchField != null && searchField.getText() != "" && item.getItem() != null && item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())) items++;
maxPages = items / 48 + 1;
page = 1;
this.pages.setText(page + "/" + maxPages);
|