|
|
@ -147,8 +147,8 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler { |
|
|
|
Building shrineBuilding; |
|
|
|
Building shrineBuilding; |
|
|
|
Shrine shrine; |
|
|
|
Shrine shrine; |
|
|
|
|
|
|
|
|
|
|
|
if (npc.getGuild().getNation() != player.getGuild().getNation()) |
|
|
|
//if (npc.getGuild().getNation() != player.getGuild().getNation())
|
|
|
|
return; |
|
|
|
// return;
|
|
|
|
|
|
|
|
|
|
|
|
shrineBuilding = npc.getBuilding(); |
|
|
|
shrineBuilding = npc.getBuilding(); |
|
|
|
|
|
|
|
|
|
|
@ -191,6 +191,9 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(shrinePower.getName().equals("Boon: Nephilim")) |
|
|
|
|
|
|
|
shrinePower.name = "Boon: Chaos"; |
|
|
|
|
|
|
|
|
|
|
|
int trains = 5 * npc.getRank() + 5;//40 - (rank * 10);
|
|
|
|
int trains = 5 * npc.getRank() + 5;//40 - (rank * 10);
|
|
|
|
if (trains < 0) |
|
|
|
if (trains < 0) |
|
|
|
trains = 0; |
|
|
|
trains = 0; |
|
|
|