nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-30 09:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed WiredConditionNotMatchStatePosition

Browse Source
This commit is contained in:
Beny 2019-05-15 22:18:00 +01:00
parent 64224fc81d
commit eac697af58
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotMatchStatePosition.java
View File

@ -24,7 +24,7 @@ public class WiredConditionNotMatchStatePosition extends InteractionWiredConditi
private boolean state; private boolean state;
private boolean position; private boolean position;
private boolean direction; private boolean rotation;
public WiredConditionNotMatchStatePosition(ResultSet set, Item baseItem) throws SQLException public WiredConditionNotMatchStatePosition(ResultSet set, Item baseItem) throws SQLException
{ {
@ -52,24 +52,13 @@ public class WiredConditionNotMatchStatePosition extends InteractionWiredConditi
if(item != null) if(item != null)
{ {
if(this.state) boolean stateMatches = !this.state || item.getExtradata().equals(setting.state);
{ boolean positionMatches = !this.position || (setting.x == item.getX() && setting.y == item.getY());
if(item.getExtradata().equals(setting.state)) boolean directionMatches = !this.rotation || setting.rotation == item.getRotation();
return false;
}
if(this.position) if(stateMatches && positionMatches && directionMatches)
{
if((setting.x == item.getX() && setting.y == item.getY()))
return false; return false;
} }
if(this.direction)
{
if((setting.rotation == item.getRotation()))
return false;
}
}
else else
{ {
s.add(setting); s.add(setting);
@ -102,7 +91,7 @@ public class WiredConditionNotMatchStatePosition extends InteractionWiredConditi
data.append(item.toString()).append(";"); data.append(item.toString()).append(";");
} }
data.append(":").append(this.state ? 1 : 0).append(":").append(this.direction ? 1 : 0).append(":").append(this.position ? 1 : 0); data.append(":").append(this.state ? 1 : 0).append(":").append(this.rotation ? 1 : 0).append(":").append(this.position ? 1 : 0);
return data.toString(); return data.toString();
} }
@ -125,7 +114,7 @@ public class WiredConditionNotMatchStatePosition extends InteractionWiredConditi
} }
this.state = data[2].equals("1"); this.state = data[2].equals("1");
this.direction = data[3].equals("1"); this.rotation = data[3].equals("1");
this.position = data[4].equals("1"); this.position = data[4].equals("1");
} }
@ -134,7 +123,7 @@ public class WiredConditionNotMatchStatePosition extends InteractionWiredConditi
{ {
this.settings.clear(); this.settings.clear();
this.state = false; this.state = false;
this.direction = false; this.rotation = false;
this.position = false; this.position = false;
} }
@ -161,7 +150,7 @@ public class WiredConditionNotMatchStatePosition extends InteractionWiredConditi
message.appendString(""); message.appendString("");
message.appendInt(4); message.appendInt(4);
message.appendInt(this.state ? 1 : 0); message.appendInt(this.state ? 1 : 0);
message.appendInt(this.direction ? 1 : 0); message.appendInt(this.rotation ? 1 : 0);
message.appendInt(this.position ? 1 : 0); message.appendInt(this.position ? 1 : 0);
message.appendInt(10); message.appendInt(10);
message.appendInt(0); message.appendInt(0);
@ -179,7 +168,7 @@ public class WiredConditionNotMatchStatePosition extends InteractionWiredConditi
packet.readInt(); packet.readInt();
this.state = packet.readInt() == 1; this.state = packet.readInt() == 1;
this.direction = packet.readInt() == 1; this.rotation = packet.readInt() == 1;
this.position = packet.readInt() == 1; this.position = packet.readInt() == 1;
packet.readString(); packet.readString();