Fix new player-is-x mixins

- Call the real method from isFriended
- Call the real method from isIgnored
- Add null check for getClanMembers

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-01-14 05:02:05 +01:00
parent 9e54bdbcb5
commit d41c6ec6d8
5 changed files with 17 additions and 16 deletions

View File

@@ -162,7 +162,7 @@ public interface Client
IndexedSprite createIndexedSprite();
boolean isFriend(String name, boolean mustBeLoggedIn);
boolean isFriended(String name, boolean mustBeLoggedIn);
boolean isIgnored(String name);

View File

@@ -74,7 +74,14 @@ public abstract class PlayerIsClanMemberMixin implements RSClient
{
isClanMember = false;
for (RSClanMember clanMember : getClanMembers())
final RSClanMember[] clanMembers = getClanMembers();
if (clanMembers == null)
{
return false;
}
for (RSClanMember clanMember : clanMembers)
{
if (clanMember == null)
{

View File

@@ -95,11 +95,4 @@ public abstract class PlayerIsFriendMixin implements RSClient
return isFriended;
}
@Inject
@Override
public boolean isFriend(String name, boolean mustBeLoggedIn)
{
return rl$isFriended(name, mustBeLoggedIn);
}
}

View File

@@ -84,11 +84,4 @@ public abstract class PlayerIsIgnoredMixin implements RSClient
return isIgnored;
}
@Inject
@Override
public boolean isIgnored(String name)
{
return rl$isIgnored(name);
}
}

View File

@@ -338,4 +338,12 @@ public interface RSClient extends RSGameEngine, Client
@Import("destinationY")
int getDestinationY();
@Import("isFriended")
@Override
boolean isFriended(String name, boolean mustBeLoggedIn);
@Import("isIgnored")
@Override
boolean isIgnored(String name);
}