Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-12-26 02:28:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix for minor NPE causes by null player when updating Spout-based appearances

Browse Source 
also updated Spout lib
This commit is contained in:
Brettflan 2011-11-06 15:27:18 -06:00
parent c43d34af79
commit dedb282498
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/SpoutAPI.jar
View File

Binary file not shown.

13
src/com/massivecraft/factions/integration/SpoutFeatures.java
View File

@ -194,12 +194,13 @@ public class SpoutFeatures
if (viewedFaction == null)
return;
SpoutPlayer sPlayer = SpoutManager.getPlayer(viewer.getPlayer());
Player pViewed = viewed.getPlayer();
if (pViewed == null || viewer.getPlayer() == null)
return;
String viewedTitle = viewed.getTitle();
Player pViewed = viewed.getPlayer();
Player pViewer = viewer.getPlayer();
if (pViewed == null || pViewer == null)
return;
SpoutPlayer sPlayer = SpoutManager.getPlayer(pViewer);
String viewedTitle = viewed.getTitle();
Rel viewedRole = viewed.getRole();
if ((Conf.spoutFactionTagsOverNames || Conf.spoutFactionTitlesOverNames) && viewer != viewed)