amethyst/NBTExplorer
1
0
Fork 0
forked from mirrors/NBTExplorer
Code Pull requests Activity

Fix bugs in search rule matching

Browse source
This commit is contained in:
Justin Aquadro 2014-02-19 20:29:22 -05:00
parent d4ad1bd99a
commit c5debf12d4
1 changed files with 77 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
NBTModel/Search/SearchRule.cs
View file

@ -169,8 +169,9 @@ namespace NBTExplorer.Model.Search
{ {
TagDataNode childNode = GetChild(container, Name); TagDataNode childNode = GetChild(container, Name);
T data = LookupTag<T>(container, Name); T data = LookupTag<T>(container, Name);
if (data == null)
return false;
if (data != null) {
switch (Operator) { switch (Operator) {
case NumericOperator.Equals: case NumericOperator.Equals:
if (data.ToTagLong() != Value) if (data.ToTagLong() != Value)
@ -188,7 +189,10 @@ namespace NBTExplorer.Model.Search
if (data.ToTagLong() >= Value) if (data.ToTagLong() >= Value)
return false; return false;
break; break;
} case NumericOperator.Any:
break;
default:
return false;
} }
if (!matchedNodes.Contains(childNode)) if (!matchedNodes.Contains(childNode))
@ -226,8 +230,9 @@ namespace NBTExplorer.Model.Search
{ {
TagDataNode childNode = GetChild(container, Name); TagDataNode childNode = GetChild(container, Name);
T data = LookupTag<T>(container, Name); T data = LookupTag<T>(container, Name);
if (data == null)
return false;
if (data != null) {
switch (Operator) { switch (Operator) {
case NumericOperator.Equals: case NumericOperator.Equals:
if (data.ToTagDouble() != Value) if (data.ToTagDouble() != Value)
@ -245,7 +250,10 @@ namespace NBTExplorer.Model.Search
if (data.ToTagDouble() >= Value) if (data.ToTagDouble() >= Value)
return false; return false;
break; break;
} case NumericOperator.Any:
break;
default:
return false;
} }
if (!matchedNodes.Contains(childNode)) if (!matchedNodes.Contains(childNode))
@ -276,8 +284,9 @@ namespace NBTExplorer.Model.Search
{ {
TagDataNode childNode = GetChild(container, Name); TagDataNode childNode = GetChild(container, Name);
TagNodeString data = LookupTag<TagNodeString>(container, Name); TagNodeString data = LookupTag<TagNodeString>(container, Name);
if (data == null)
return false;
if (data != null) {
switch (Operator) { switch (Operator) {
case StringOperator.Equals: case StringOperator.Equals:
if (data.ToTagString().Data != Value) if (data.ToTagString().Data != Value)
@ -303,7 +312,10 @@ namespace NBTExplorer.Model.Search
if (!data.ToTagString().Data.EndsWith(Value)) if (!data.ToTagString().Data.EndsWith(Value))
return false; return false;
break; break;
} case StringOperator.Any:
break;
default:
return false;
} }
if (!matchedNodes.Contains(childNode)) if (!matchedNodes.Contains(childNode))