Skip to content

Commit

Permalink
Working on fixing null player... Making factions optional dep.
Browse files Browse the repository at this point in the history
  • Loading branch information
squidicuzz committed Nov 13, 2012
1 parent d64d40c commit 3df9e17
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: BubbleShield
author: squidicuz
version: 0.9.92
main: net.sqdmc.bubbleshield.BubbleShield
depend: [Factions]
softdepend: [Factions]

commands:
bubbleshield:
Expand Down
14 changes: 9 additions & 5 deletions src/net/sqdmc/bubbleshield/ShieldOwnerPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ public class ShieldOwnerPlayer extends ShieldOwner {

public ShieldOwnerPlayer(String name) {
Player player = Bukkit.getPlayer(name);
OfflinePlayer offPlayer = Bukkit.getOfflinePlayer(name);

this.shieldOwner = player;
this.shieldOwnerOff = player;
this.shieldOwnerOff = offPlayer;
}

public ShieldOwnerPlayer(Player player) {
Expand All @@ -23,7 +24,10 @@ public ShieldOwnerPlayer(Player player) {

@Override
public String getOwner() {
return shieldOwner.getName();
if (this.shieldOwnerOff.isOnline())
return this.shieldOwner.getName();
else
return this.shieldOwnerOff.getName();
}

public void setPlayer(Player player){
Expand All @@ -33,8 +37,8 @@ public void setPlayer(Player player){

@Override
public void sendMessage(String message) {
if (shieldOwner != null && shieldOwner.isOnline()) {
shieldOwner.sendMessage(message);
if (this.shieldOwner != null && this.shieldOwnerOff.isOnline()) {
this.shieldOwner.sendMessage(message);
}
}

Expand Down Expand Up @@ -62,6 +66,6 @@ public boolean equals(Object obj) {

@Override
public String toString() {
return shieldOwner.getName();
return this.shieldOwner.getName();
}
}
2 changes: 1 addition & 1 deletion src/net/sqdmc/bubbleshield/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static ShieldBase getShieldBase(Location targetLoc) {
public static int getShieldCount(ShieldStorage shieldstorage, String owner) {
int count = 0;
for (ShieldBase shieldbase : shieldstorage.GetShieldBases()) {
if (shieldbase.shield.getShieldOwner().getOwner() == owner) {
if (shieldbase.shield.getShieldOwner() != null && shieldbase.shield.getShieldOwner().getOwner() == owner) {
count++;
}
}
Expand Down

0 comments on commit 3df9e17

Please sign in to comment.