Fixed crash if Resident is null at /sethome

This commit is contained in:
Norbi Peti 2016-01-10 02:00:13 +01:00
parent 47419c0925
commit 4fe8085de8
3 changed files with 2 additions and 2 deletions

Binary file not shown.

View file

@ -471,7 +471,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
return;
}
} else if (player.CurrentChannel.equals(Channel.AdminChat)) {
try {
try { // TODO: Put message JSON into it's structure
if (!event.getPlayer().isOp()) {
event.getPlayer().sendMessage(
"§cYou need to be an OP to use this channel.");
@ -665,7 +665,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
if (town.hasNation()) {
Resident res = tu.getResidentMap().get(
event.getPlayer().getName());
if (res.hasTown()) {
if (res != null && res.hasTown()) {
Town town2 = res.getTown();
if (town2.hasNation()) {
if (town.getNation().getEnemies()