forked from MagicBane/Server
guild lookup no lonkger retursn null, return ErrantGuild
This commit is contained in:
@@ -639,17 +639,17 @@ public class City extends AbstractWorldObject {
|
||||
public Guild getGuild() {
|
||||
|
||||
if (this.getTOL() == null)
|
||||
return null;
|
||||
return Guild.getErrantGuild();
|
||||
|
||||
if (this.isNpc == 1) {
|
||||
|
||||
if (this.getTOL().getOwner() == null)
|
||||
return null;
|
||||
return Guild.getErrantGuild();
|
||||
return this.getTOL().getOwner().getGuild();
|
||||
} else {
|
||||
|
||||
if (this.getTOL().getOwner() == null)
|
||||
return null;
|
||||
return Guild.getErrantGuild();
|
||||
return this.getTOL().getOwner().getGuild();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user