Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More refactoring of code.

Browse Source
This commit is contained in:
hondacrx
2019-09-23 21:41:13 -04:00
parent 2418715800
commit 570aebce26
176 changed files with 2261 additions and 2265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/BattleGroundHandler.cs
+3 -3
View File
@@ -184,7 +184,7 @@ namespace Game
avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry.GetBracketId());
}
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next())
{
Player member = refe.GetSource();
if (!member)
@@ -221,7 +221,7 @@ namespace Game
return;
// Prevent players from sending BuildPvpLogDataPacket in an arena except for when sent in Battleground.EndBattleground.
if (bg.isArena())
if (bg.IsArena())
return;
PVPLogData pvpLogData;
@@ -544,7 +544,7 @@ namespace Game
avgTime = bgQueue.GetAverageQueueWaitTime(ginfo, bracketEntry.GetBracketId());
}
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next())
{
Player member = refe.GetSource();
if (!member)
Source/Game/Handlers/ChatHandler.cs
+3 -3
View File
@@ -273,7 +273,7 @@ namespace Game
if (!group)
{
group = GetPlayer().GetGroup();
if (!group || group.isBGGroup())
if (!group || group.IsBGGroup())
return;
}
@@ -314,7 +314,7 @@ namespace Game
case ChatMsg.Raid:
{
Group group = GetPlayer().GetGroup();
if (!group || !group.isRaidGroup() || group.isBGGroup())
if (!group || !group.IsRaidGroup() || group.IsBGGroup())
return;
if (group.IsLeader(GetPlayer().GetGUID()))
@@ -330,7 +330,7 @@ namespace Game
case ChatMsg.RaidWarning:
{
Group group = GetPlayer().GetGroup();
if (!group || !(group.isRaidGroup() || WorldConfig.GetBoolValue(WorldCfg.ChatPartyRaidWarnings)) || !(group.IsLeader(GetPlayer().GetGUID()) || group.IsAssistant(GetPlayer().GetGUID())) || group.isBGGroup())
if (!group || !(group.IsRaidGroup() || WorldConfig.GetBoolValue(WorldCfg.ChatPartyRaidWarnings)) || !(group.IsLeader(GetPlayer().GetGUID()) || group.IsAssistant(GetPlayer().GetGUID())) || group.IsBGGroup())
return;
Global.ScriptMgr.OnPlayerChat(GetPlayer(), type, lang, msg, group);
Source/Game/Handlers/GroupHandler.cs
+4 -4
View File
@@ -95,11 +95,11 @@ namespace Game
}
Group group = GetPlayer().GetGroup();
if (group && group.isBGGroup())
if (group && group.IsBGGroup())
group = GetPlayer().GetOriginalGroup();
Group group2 = player.GetGroup();
if (group2 && group2.isBGGroup())
if (group2 && group2.IsBGGroup())
group2 = player.GetOriginalGroup();
PartyInvite partyInvite;
@@ -421,7 +421,7 @@ namespace Game
group.SendTargetIconList(this, packet.PartyIndex);
else // target icon update
{
if (group.isRaidGroup() && !group.IsLeader(GetPlayer().GetGUID()) && !group.IsAssistant(GetPlayer().GetGUID()))
if (group.IsRaidGroup() && !group.IsLeader(GetPlayer().GetGUID()) && !group.IsAssistant(GetPlayer().GetGUID()))
return;
if (packet.Target.IsPlayer())
@@ -645,7 +645,7 @@ namespace Game
if (!group)
return;
if (group.isRaidGroup() && !group.IsLeader(GetPlayer().GetGUID()) && !group.IsAssistant(GetPlayer().GetGUID()))
if (group.IsRaidGroup() && !group.IsLeader(GetPlayer().GetGUID()) && !group.IsAssistant(GetPlayer().GetGUID()))
return;
group.DeleteRaidMarker(packet.MarkerId);
Source/Game/Handlers/LFGHandler.cs
+3 -3
View File
@@ -32,9 +32,9 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.DfJoin)]
void HandleLfgJoin(DFJoin dfJoin)
{
if (!Global.LFGMgr.isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser) ||
if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser) ||
(GetPlayer().GetGroup() && GetPlayer().GetGroup().GetLeaderGUID() != GetPlayer().GetGUID() &&
(GetPlayer().GetGroup().GetMembersCount() == MapConst.MaxGroupSize || !GetPlayer().GetGroup().isLFGGroup())))
(GetPlayer().GetGroup().GetMembersCount() == MapConst.MaxGroupSize || !GetPlayer().GetGroup().IsLFGGroup())))
return;
if (dfJoin.Slots.Empty())
@@ -218,7 +218,7 @@ namespace Game
LfgPartyInfo lfgPartyInfo = new LfgPartyInfo();
// Get the Locked dungeons of the other party members
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player plrg = refe.GetSource();
if (!plrg)
Source/Game/Handlers/LootHandler.cs
+11 -11
View File
@@ -95,7 +95,7 @@ namespace Game
player.StoreLootItem((byte)(req.LootListID - 1), loot, aeResult);
// If player is removing the last LootItem, delete the empty container.
if (loot.isLooted() && lguid.IsItem())
if (loot.IsLooted() && lguid.IsItem())
player.GetSession().DoLootRelease(lguid);
}
@@ -185,7 +185,7 @@ namespace Game
Group group = player.GetGroup();
List<Player> playersNear = new List<Player>();
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player member = refe.GetSource();
if (!member)
@@ -232,7 +232,7 @@ namespace Game
loot.DeleteLootMoneyFromContainerItemDB();
// Delete container if empty
if (loot.isLooted() && guid.IsItem())
if (loot.IsLooted() && guid.IsItem())
player.GetSession().DoLootRelease(guid);
}
}
@@ -337,7 +337,7 @@ namespace Game
// locked doors are opened with spelleffect openlock, prevent remove its as looted
go.UseDoorOrButton();
}
else if (loot.isLooted() || go.GetGoType() == GameObjectTypes.FishingNode)
else if (loot.IsLooted() || go.GetGoType() == GameObjectTypes.FishingNode)
{
if (go.GetGoType() == GameObjectTypes.FishingHole)
{ // The fishing hole used once more
@@ -350,7 +350,7 @@ namespace Game
else
go.SetLootState(LootState.JustDeactivated);
loot.clear();
loot.Clear();
}
else
{
@@ -370,9 +370,9 @@ namespace Game
loot = corpse.loot;
if (loot.isLooted())
if (loot.IsLooted())
{
loot.clear();
loot.Clear();
corpse.RemoveCorpseDynamicFlag(CorpseDynFlags.Lootable);
}
}
@@ -388,7 +388,7 @@ namespace Game
if (proto.GetFlags().HasAnyFlag(ItemFlags.IsProspectable | ItemFlags.IsMillable))
{
pItem.m_lootGenerated = false;
pItem.loot.clear();
pItem.loot.Clear();
uint count = pItem.GetCount();
@@ -400,7 +400,7 @@ namespace Game
}
else
{
if (pItem.loot.isLooted() || !proto.GetFlags().HasAnyFlag(ItemFlags.HasLoot)) // Only delete item if no loot or money (unlooted loot is saved to db)
if (pItem.loot.IsLooted() || !proto.GetFlags().HasAnyFlag(ItemFlags.HasLoot)) // Only delete item if no loot or money (unlooted loot is saved to db)
player.DestroyItem(pItem.GetBagSlot(), pItem.GetSlot(), true);
}
return; // item can be looted only single player
@@ -414,7 +414,7 @@ namespace Game
return;
loot = creature.loot;
if (loot.isLooted())
if (loot.IsLooted())
{
creature.RemoveDynamicFlag(UnitDynFlags.Lootable);
@@ -422,7 +422,7 @@ namespace Game
if (!creature.IsAlive())
creature.AllLootRemovedFromCorpse();
loot.clear();
loot.Clear();
}
else
{
Source/Game/Handlers/MiscHandler.cs
+3 -3
View File
@@ -328,7 +328,7 @@ namespace Game
Group group = player.GetGroup();
if (group)
if (group.isLFGGroup() && player.GetMap().IsDungeon())
if (group.IsLFGGroup() && player.GetMap().IsDungeon())
teleported = player.TeleportToBGEntryPoint();
}
@@ -582,7 +582,7 @@ namespace Game
{
if (group.IsLeader(GetPlayer().GetGUID()))
{
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player groupGuy = refe.GetSource();
if (!groupGuy)
@@ -662,7 +662,7 @@ namespace Game
{
if (group.IsLeader(GetPlayer().GetGUID()))
{
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player groupGuy = refe.GetSource();
if (!groupGuy)
Source/Game/Handlers/MovementHandler.cs
+2 -2
View File
@@ -340,7 +340,7 @@ namespace Game
if (!seamlessTeleport)
{
// short preparations to continue flight
FlightPathMovementGenerator flight = (FlightPathMovementGenerator)GetPlayer().GetMotionMaster().top();
FlightPathMovementGenerator flight = (FlightPathMovementGenerator)GetPlayer().GetMotionMaster().Top();
flight.Initialize(GetPlayer());
}
return;
@@ -733,7 +733,7 @@ namespace Game
if (GetPlayer().GetMotionMaster().GetCurrentMovementGeneratorType() == MovementGeneratorType.Flight)
{
// short preparations to continue flight
FlightPathMovementGenerator flight = (FlightPathMovementGenerator)GetPlayer().GetMotionMaster().top();
FlightPathMovementGenerator flight = (FlightPathMovementGenerator)GetPlayer().GetMotionMaster().Top();
flight.SetCurrentNodeAfterTeleport();
TaxiPathNodeRecord node = flight.GetPath()[(int)flight.GetCurrentNode()];
Source/Game/Handlers/NPCHandler.cs
+3 -3
View File
@@ -164,7 +164,7 @@ namespace Game
GetPlayer().PrepareGossipMenu(unit, unit.GetCreatureTemplate().GossipMenuId, true);
GetPlayer().SendPreparedGossip(unit);
}
unit.GetAI().sGossipHello(GetPlayer());
unit.GetAI().GossipHello(GetPlayer());
}
[WorldPacketHandler(ClientOpcodes.GossipSelectOption)]
@@ -222,7 +222,7 @@ namespace Game
{
if (unit)
{
unit.GetAI().sGossipSelectCode(GetPlayer(), packet.GossipID, packet.GossipIndex, packet.PromotionCode);
unit.GetAI().GossipSelectCode(GetPlayer(), packet.GossipID, packet.GossipIndex, packet.PromotionCode);
if (!Global.ScriptMgr.OnGossipSelectCode(GetPlayer(), unit, GetPlayer().PlayerTalkClass.GetGossipOptionSender(packet.GossipIndex), GetPlayer().PlayerTalkClass.GetGossipOptionAction(packet.GossipIndex), packet.PromotionCode))
GetPlayer().OnGossipSelect(unit, packet.GossipIndex, packet.GossipID);
}
@@ -236,7 +236,7 @@ namespace Game
{
if (unit != null)
{
unit.GetAI().sGossipSelect(GetPlayer(), packet.GossipID, packet.GossipIndex);
unit.GetAI().GossipSelect(GetPlayer(), packet.GossipID, packet.GossipIndex);
if (!Global.ScriptMgr.OnGossipSelect(GetPlayer(), unit, GetPlayer().PlayerTalkClass.GetGossipOptionSender(packet.GossipIndex), GetPlayer().PlayerTalkClass.GetGossipOptionAction(packet.GossipIndex)))
GetPlayer().OnGossipSelect(unit, packet.GossipIndex, packet.GossipID);
}
Source/Game/Handlers/PetHandler.cs
+4 -4
View File
@@ -369,7 +369,7 @@ namespace Game
}
}
spell.prepare(spell.m_targets);
spell.Prepare(spell.m_targets);
}
else
{
@@ -381,7 +381,7 @@ namespace Game
if (!pet.GetSpellHistory().HasCooldown(spellid))
pet.GetSpellHistory().ResetCooldown(spellid, true);
spell.finish(false);
spell.Finish(false);
spell.Dispose();
// reset specific flags in case of spell fail. AI will reset other flags
@@ -692,7 +692,7 @@ namespace Game
spellPrepare.ServerCastID = spell.m_castId;
SendPacket(spellPrepare);
spell.prepare(targets);
spell.Prepare(targets);
}
else
{
@@ -701,7 +701,7 @@ namespace Game
if (!caster.GetSpellHistory().HasCooldown(spellInfo.Id))
caster.GetSpellHistory().ResetCooldown(spellInfo.Id, true);
spell.finish(false);
spell.Finish(false);
spell.Dispose();
}
}
Source/Game/Handlers/QuestHandler.cs
+4 -4
View File
@@ -80,7 +80,7 @@ namespace Game
GetPlayer().PrepareGossipMenu(creature, creature.GetCreatureTemplate().GossipMenuId, true);
GetPlayer().SendPreparedGossip(creature);
creature.GetAI().sGossipHello(GetPlayer());
creature.GetAI().GossipHello(GetPlayer());
}
[WorldPacketHandler(ClientOpcodes.QuestGiverAcceptQuest)]
@@ -164,7 +164,7 @@ namespace Game
var group = _player.GetGroup();
if (group)
{
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player player = refe.GetSource();
@@ -351,7 +351,7 @@ namespace Game
}
if (creatureQGiver)
creatureQGiver.GetAI().sQuestReward(GetPlayer(), quest, packet.ItemChoiceID);
creatureQGiver.GetAI().QuestReward(GetPlayer(), quest, packet.ItemChoiceID);
}
break;
}
@@ -563,7 +563,7 @@ namespace Game
Group group = sender.GetGroup();
if (!group)
return;
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player receiver = refe.GetSource();
Source/Game/Handlers/SpellHandler.cs
+1 -1
View File
@@ -337,7 +337,7 @@ namespace Game
spell.m_fromClient = true;
spell.m_misc.Data0 = cast.Cast.Misc[0];
spell.m_misc.Data1 = cast.Cast.Misc[1];
spell.prepare(targets);
spell.Prepare(targets);
}
[WorldPacketHandler(ClientOpcodes.CancelCast, Processing = PacketProcessing.ThreadSafe)]
Source/Game/Handlers/TaxiHandler.cs
+1 -1
View File
@@ -238,7 +238,7 @@ namespace Game
{
if (GetPlayer().m_taxi.RequestEarlyLanding())
{
FlightPathMovementGenerator flight = (FlightPathMovementGenerator)GetPlayer().GetMotionMaster().top();
FlightPathMovementGenerator flight = (FlightPathMovementGenerator)GetPlayer().GetMotionMaster().Top();
flight.LoadPath(GetPlayer(), flight.GetPath()[(int)flight.GetCurrentNode()].NodeIndex);
flight.Reset(GetPlayer());
}
Source/Game/Handlers/ToyHandler.cs
+1 -1
View File
@@ -91,7 +91,7 @@ namespace Game
spell.m_misc.Data0 = packet.Cast.Misc[0];
spell.m_misc.Data1 = packet.Cast.Misc[1];
spell.m_castFlagsEx |= SpellCastFlagsEx.UseToySpell;
spell.prepare(targets);
spell.Prepare(targets);
}
[WorldPacketHandler(ClientOpcodes.ToyClearFanfare)]
Source/Game/Handlers/TradeHandler.cs
+22 -22
View File
@@ -94,7 +94,7 @@ namespace Game
SendPacket(tradeUpdated);
}
void moveItems(Item[] myItems, Item[] hisItems)
void MoveItems(Item[] myItems, Item[] hisItems)
{
Player trader = GetPlayer().GetTrader();
if (!trader)
@@ -176,7 +176,7 @@ namespace Game
}
}
static void setAcceptTradeMode(TradeData myTrade, TradeData hisTrade, Item[] myItems, Item[] hisItems)
static void SetAcceptTradeMode(TradeData myTrade, TradeData hisTrade, Item[] myItems, Item[] hisItems)
{
myTrade.SetInAcceptProcess(true);
hisTrade.SetInAcceptProcess(true);
@@ -202,13 +202,13 @@ namespace Game
}
}
static void clearAcceptTradeMode(TradeData myTrade, TradeData hisTrade)
static void ClearAcceptTradeMode(TradeData myTrade, TradeData hisTrade)
{
myTrade.SetInAcceptProcess(false);
hisTrade.SetInAcceptProcess(false);
}
static void clearAcceptTradeMode(Item[] myItems, Item[] hisItems)
static void ClearAcceptTradeMode(Item[] myItems, Item[] hisItems)
{
// clear 'in-trade' flag
for (byte i = 0; i < (int)TradeSlots.Count; ++i)
@@ -329,7 +329,7 @@ namespace Game
if (his_trade.IsAccepted())
{
setAcceptTradeMode(my_trade, his_trade, myItems, hisItems);
SetAcceptTradeMode(my_trade, his_trade, myItems, hisItems);
Spell my_spell = null;
SpellCastTargets my_targets = new SpellCastTargets();
@@ -347,8 +347,8 @@ namespace Game
if (spellEntry == null || !his_trade.GetItem(TradeSlots.NonTraded) ||
(my_trade.HasSpellCastItem() && !castItem))
{
clearAcceptTradeMode(my_trade, his_trade);
clearAcceptTradeMode(myItems, hisItems);
ClearAcceptTradeMode(my_trade, his_trade);
ClearAcceptTradeMode(myItems, hisItems);
my_trade.SetSpell(0);
return;
@@ -364,8 +364,8 @@ namespace Game
{
my_spell.SendCastResult(res);
clearAcceptTradeMode(my_trade, his_trade);
clearAcceptTradeMode(myItems, hisItems);
ClearAcceptTradeMode(my_trade, his_trade);
ClearAcceptTradeMode(myItems, hisItems);
my_spell.Dispose();
my_trade.SetSpell(0);
@@ -384,8 +384,8 @@ namespace Game
{
his_trade.SetSpell(0);
clearAcceptTradeMode(my_trade, his_trade);
clearAcceptTradeMode(myItems, hisItems);
ClearAcceptTradeMode(my_trade, his_trade);
ClearAcceptTradeMode(myItems, hisItems);
return;
}
@@ -399,8 +399,8 @@ namespace Game
{
his_spell.SendCastResult(res);
clearAcceptTradeMode(my_trade, his_trade);
clearAcceptTradeMode(myItems, hisItems);
ClearAcceptTradeMode(my_trade, his_trade);
ClearAcceptTradeMode(myItems, hisItems);
my_spell.Dispose();
his_spell.Dispose();
@@ -420,12 +420,12 @@ namespace Game
hisCanCompleteInfo.BagResult = trader.CanStoreItems(myItems, (int)TradeSlots.TradedCount, ref hisCanCompleteInfo.ItemID);
myCanCompleteInfo.BagResult = GetPlayer().CanStoreItems(hisItems, (int)TradeSlots.TradedCount, ref myCanCompleteInfo.ItemID);
clearAcceptTradeMode(myItems, hisItems);
ClearAcceptTradeMode(myItems, hisItems);
// in case of missing space report error
if (myCanCompleteInfo.BagResult != InventoryResult.Ok)
{
clearAcceptTradeMode(my_trade, his_trade);
ClearAcceptTradeMode(my_trade, his_trade);
myCanCompleteInfo.Status = TradeStatus.Failed;
trader.GetSession().SendTradeStatus(myCanCompleteInfo);
@@ -437,7 +437,7 @@ namespace Game
}
else if (hisCanCompleteInfo.BagResult != InventoryResult.Ok)
{
clearAcceptTradeMode(my_trade, his_trade);
ClearAcceptTradeMode(my_trade, his_trade);
hisCanCompleteInfo.Status = TradeStatus.Failed;
SendTradeStatus(hisCanCompleteInfo);
@@ -464,7 +464,7 @@ namespace Game
}
// execute trade: 2. store
moveItems(myItems, hisItems);
MoveItems(myItems, hisItems);
// logging money
if (HasPermission(RBACPermissions.LogGmTrade))
@@ -490,13 +490,13 @@ namespace Game
trader.ModifyMoney((long)my_trade.GetMoney());
if (my_spell)
my_spell.prepare(my_targets);
my_spell.Prepare(my_targets);
if (his_spell)
his_spell.prepare(his_targets);
his_spell.Prepare(his_targets);
// cleanup
clearAcceptTradeMode(my_trade, his_trade);
ClearAcceptTradeMode(my_trade, his_trade);
GetPlayer().SetTradeData(null);
trader.SetTradeData(null);
@@ -578,7 +578,7 @@ namespace Game
return;
}
if (isLogingOut())
if (IsLogingOut())
{
info.Status = TradeStatus.LoggingOut;
SendTradeStatus(info);
@@ -635,7 +635,7 @@ namespace Game
return;
}
if (pOther.GetSession().isLogingOut())
if (pOther.GetSession().IsLogingOut())
{
info.Status = TradeStatus.TargetLoggingOut;
SendTradeStatus(info);