ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

playerindicator: Caller and Caller Pile highlight fix (#1723)

Browse Source 
* Fix player attack options and player indicators

* player attack options

* buying checkstyle bypass method

* for testing the bootstrapper. if the testing works, this can be merged

Signed-off-by: PKLite <stonewall@pklite.xyz>

* runtimeClasspath

Signed-off-by: PKLite <stonewall@pklite.xyz>

* runtimeClasspath

Signed-off-by: PKLite <stonewall@pklite.xyz>

* launcher version bump

Signed-off-by: PKLite <stonewall@pklite.xyz>

* ,

Signed-off-by: PKLite <stonewall@pklite.xyz>

* Fix Caller/Pile highlighting

Signed-off-by: PKLite <stonewall@pklite.xyz>
This commit is contained in:
ST0NEWALL
2019-10-11 06:08:31 -04:00
committed by Kyle
parent 34b79e5625
commit 3c7ff60d08
2 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
View File

@@ -186,6 +186,11 @@ public class PlayerIndicatorsPlugin extends Plugin
return; return;
} }
if (event.getTarget() == null)
{
return;
}
callerPiles.put(caller.getName(), event.getTarget()); callerPiles.put(caller.getName(), event.getTarget());
} }
@@ -286,7 +291,21 @@ public class PlayerIndicatorsPlugin extends Plugin
int image2 = -1; int image2 = -1;
Color color = null; Color color = null;
if (this.highlightFriends && client.isFriended(player.getName(), false)) if (this.highlightCallers && isCaller(player))
{
if (Arrays.asList(this.locationHashMap.get(PlayerRelation.CALLER)).contains(PlayerIndicationLocation.MENU))
{
color = relationColorHashMap.get(PlayerRelation.CALLER);
}
}
else if (this.highlightCallerTargets && isPile(player))
{
if (Arrays.asList(this.locationHashMap.get(PlayerRelation.CALLER_TARGET)).contains(PlayerIndicationLocation.MENU))
{
color = relationColorHashMap.get(PlayerRelation.CALLER_TARGET);
}
}
else if (this.highlightFriends && client.isFriended(player.getName(), false))
{ {
if (Arrays.asList(this.locationHashMap.get(PlayerRelation.FRIEND)).contains(PlayerIndicationLocation.MENU)) if (Arrays.asList(this.locationHashMap.get(PlayerRelation.FRIEND)).contains(PlayerIndicationLocation.MENU))
{ {
@@ -328,20 +347,7 @@ public class PlayerIndicatorsPlugin extends Plugin
color = relationColorHashMap.get(PlayerRelation.TARGET); color = relationColorHashMap.get(PlayerRelation.TARGET);
} }
} }
else if (this.highlightCallers && isCaller(player))
{
if (Arrays.asList(this.locationHashMap.get(PlayerRelation.CALLER)).contains(PlayerIndicationLocation.MENU))
{
color = relationColorHashMap.get(PlayerRelation.CALLER);
}
}
else if (this.highlightCallerTargets && isPile(player))
{
if (Arrays.asList(this.locationHashMap.get(PlayerRelation.CALLER_TARGET)).contains(PlayerIndicationLocation.MENU))
{
color = relationColorHashMap.get(PlayerRelation.CALLER_TARGET);
}
}
if (this.playerSkull && !player.isClanMember() && player.getSkullIcon() != null) if (this.playerSkull && !player.isClanMember() && player.getSkullIcon() != null)
{ {
@@ -450,7 +456,13 @@ public class PlayerIndicatorsPlugin extends Plugin
*/ */
public boolean isPile(Actor actor) public boolean isPile(Actor actor)
{ {
if (!(actor instanceof Player)) /**
if (!(actor instanceof Player))
{
return false;
}
**/
if (actor == null)
{ {
return false; return false;
} }

30
runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java
View File

@@ -95,6 +95,21 @@ public class PlayerIndicatorsService
final List<Player> players = client.getPlayers(); final List<Player> players = client.getPlayers();
for (Player p : players) for (Player p : players)
{ {
if (caller.test(p))
{
consumer.accept(p, PlayerRelation.CALLER);
continue;
}
if (callerTarget.test(p) )
{
consumer.accept(p, PlayerRelation.CALLER_TARGET);
continue;
}
if (other.test(p))
{
consumer.accept(p, PlayerRelation.OTHER);
continue;
}
if (self.test(p)) if (self.test(p))
{ {
consumer.accept(p, PlayerRelation.SELF); consumer.accept(p, PlayerRelation.SELF);
@@ -118,21 +133,6 @@ public class PlayerIndicatorsService
if (target.test(p)) if (target.test(p))
{ {
consumer.accept(p, PlayerRelation.TARGET); consumer.accept(p, PlayerRelation.TARGET);
continue;
}
if (caller.test(p))
{
consumer.accept(p, PlayerRelation.CALLER);
continue;
}
if (callerTarget.test(p) )
{
consumer.accept(p, PlayerRelation.CALLER_TARGET);
continue;
}
if (other.test(p))
{
consumer.accept(p, PlayerRelation.OTHER);
} }
} }
} }