Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

ABS char skill system

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-03-27 17:17:34 -05:00
parent 27d869276a
commit aff2a8fa0e
16 changed files with 542 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java
+2 -5
View File
@@ -12,10 +12,7 @@ import engine.net.client.msg.ArcLoginNotifyMsg;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.HotzoneChangeMsg;
import engine.net.client.msg.PetMsg;
import engine.objects.Account;
import engine.objects.Guild;
import engine.objects.PlayerCharacter;
import engine.objects.PlayerFriends;
import engine.objects.*;
import engine.server.MBServerStatics;
import engine.session.Session;
import org.pmw.tinylog.Logger;
@@ -73,7 +70,7 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
ChatManager.sendSystemMessage(player, ConfigManager.currentRepoBranch);
// Set player mask for QT
if (player.getRace() != null && player.getRace().getToken() == -524731385)
if (player.race != null && player.race.getToken() == -524731385)
player.setObjectTypeMask(MBServerStatics.MASK_PLAYER | MBServerStatics.MASK_UNDEAD);
else
player.setObjectTypeMask(MBServerStatics.MASK_PLAYER);
src/engine/net/client/handlers/ChangeRankHandler.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
targetPlayer.setGuildTitle(msg.getNewRank());
targetName = targetPlayer.getFirstName();
isMale = targetPlayer.getRace().getRaceType().getCharacterSex().equals(Enum.CharacterSex.MALE);
isMale = targetPlayer.race.getRaceType().getCharacterSex().equals(Enum.CharacterSex.MALE);
} else {
DbManager.GuildQueries.UPDATE_GUILD_RANK_OFFLINE(msg.getPlayerUUID(), msg.getNewRank(), sourcePlayer.getGuild().getObjectUUID());
src/engine/net/client/handlers/VendorDialogMsgHandler.java
+2 -2
View File
@@ -376,14 +376,14 @@ public class VendorDialogMsgHandler extends AbstractClientMsgHandler {
}
// verify race valid for profession
Race race = pc.getRace();
Race race = pc.race;
if (race == null || !promo.isAllowedRune(race.getToken())) {
// TODO send client promotion error
return;
}
// verify baseclass valid for profession
BaseClass bc = pc.getBaseClass();
BaseClass bc = pc.baseClass;
if (bc == null || !promo.isAllowedRune(bc.getToken())) {
// TODO send client promotion error
return;
src/engine/net/client/msg/WhoResponseMsg.java
+3 -6
View File
@@ -14,10 +14,7 @@ import engine.gameManager.SessionManager;
import engine.net.*;
import engine.net.client.ClientConnection;
import engine.net.client.Protocol;
import engine.objects.Guild;
import engine.objects.GuildStatusController;
import engine.objects.PlayerCharacter;
import engine.objects.PromotionClass;
import engine.objects.*;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
@@ -91,7 +88,7 @@ public class WhoResponseMsg extends ClientNetMsg {
if (player != null)
if (!isAdmin(player))
if (player.isActive()) {
String[] race = player.getRace().getName().split(",");
String[] race = player.race.getName().split(",");
if (filter.compareTo(race[0]) == 0)
if (!HandleSet(set, player, playerCharacter, msg))
break;
@@ -101,7 +98,7 @@ public class WhoResponseMsg extends ClientNetMsg {
if (player != null)
if (!isAdmin(player))
if (player.isActive()) {
if (filter.compareTo(player.getBaseClass().getName()) == 0 || (player.getPromotionClass() != null && filter.compareTo(player.getPromotionClass().getName()) == 0))
if (filter.compareTo(player.baseClass.getName()) == 0 || (player.getPromotionClass() != null && filter.compareTo(player.getPromotionClass().getName()) == 0))
if (!HandleSet(set, player, playerCharacter, msg))
break;