fix: Fixes ignoring mobs, champions, party crash, slayer rarity, boat speedhack, etc (#1222)
* Movie ignore mobiles to Mobile class * Allow necromancer familiars to ignore mobiles * ChampionSpawn should not quietly fail when creating new spawn * Fix client party crash bug: 2 people partied, the leader logs out, other client is hung * Fix spellbooks creating with magery/meditation only and creating magery multiple times * Fix BaseRunicTool.GetRandomSlayer() creating more undead slayers than intended * Do not allow players to dismount each other whilst mounted * Fix AOS onwards damage increase tooltip and wrong formula in AOS * Fix monsters killing other monster revenants + animate dead should not attack player pets + other animates * Fix fire steed having loot pack added twice * Fix oaks spawn not able to create Unicorns + Kirins via Activator.CreateInstace() due to constructor having name as parametr * Fix ignoreMobiles flag not propagated to client for non-players. * Fix harrower tents not leeching from players * Fix boats speedhacking around the map * Fix bless, agility etc. not renewing duration * Fix reveal always worked * Fix empty constructor for steeds so they don't throw now.
This commit is contained in:
parent
910e06767b
commit
053dbcbad0
54 changed files with 871 additions and 454 deletions
|
|
@ -195,7 +195,7 @@ namespace Server.Engines.PartySystem
|
|||
m.Party = this;
|
||||
|
||||
Span<byte> memberList =
|
||||
stackalloc byte[PartyPackets.GetPartyMemberListPacketLength(this)].InitializePacket();
|
||||
stackalloc byte[PartyPackets.GetPartyMemberListPacketLength(Count)].InitializePacket();
|
||||
Span<byte> attrsPacket = stackalloc byte[OutgoingMobilePackets.MobileAttributesPacketLength].InitializePacket();
|
||||
|
||||
for (var i = 0; i < Members.Count; ++i)
|
||||
|
|
@ -216,12 +216,7 @@ namespace Server.Engines.PartySystem
|
|||
}
|
||||
}
|
||||
|
||||
public void OnAccept(Mobile from)
|
||||
{
|
||||
OnAccept(from, false);
|
||||
}
|
||||
|
||||
public void OnAccept(Mobile from, bool force)
|
||||
public void OnAccept(Mobile from, bool force = false)
|
||||
{
|
||||
var ourFaction = Faction.Find(Leader);
|
||||
var theirFaction = Faction.Find(from);
|
||||
|
|
@ -289,28 +284,33 @@ namespace Server.Engines.PartySystem
|
|||
return;
|
||||
}
|
||||
|
||||
Span<byte> removeMember =
|
||||
stackalloc byte[PartyPackets.GetPartyRemoveMemberPacketLength(this)].InitializePacket();
|
||||
|
||||
var removed = false;
|
||||
for (var i = 0; i < Members.Count; i++)
|
||||
{
|
||||
if (Members[i].Mobile == m)
|
||||
{
|
||||
Members.RemoveAt(i);
|
||||
|
||||
m.NetState.SendPartyRemoveMember(m.Serial);
|
||||
m.Party = null;
|
||||
|
||||
m.SendLocalizedMessage(1005451); // You have been removed from the party.
|
||||
|
||||
PartyPackets.CreatePartyRemoveMember(removeMember, m.Serial, this);
|
||||
SendToAll(removeMember);
|
||||
SendToAll(1005452); // A player has been removed from your party.
|
||||
|
||||
removed = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (removed)
|
||||
{
|
||||
Span<byte> removeMember =
|
||||
stackalloc byte[PartyPackets.GetPartyRemoveMemberPacketLength(Count)].InitializePacket();
|
||||
|
||||
// Send empty party to the player removed
|
||||
m.NetState.SendPartyRemoveMember(m.Serial);
|
||||
m.Party = null;
|
||||
|
||||
m.SendLocalizedMessage(1005451); // You have been removed from the party.
|
||||
|
||||
PartyPackets.CreatePartyRemoveMember(removeMember, m.Serial, this);
|
||||
SendToAll(removeMember);
|
||||
SendToAll(1005452); // A player has been removed from your party.
|
||||
}
|
||||
|
||||
if (Members.Count == 1)
|
||||
{
|
||||
SendToAll(1005450); // The last person has left the party...
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ namespace Server.Engines.PartySystem
|
|||
public static class PartyPackets
|
||||
{
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static int GetPartyMemberListPacketLength(Party p) => 7 + p.Count * 4;
|
||||
public static int GetPartyMemberListPacketLength(int partyCount) => 7 + partyCount * 4;
|
||||
|
||||
public static void CreatePartyMemberList(Span<byte> buffer, Party p)
|
||||
{
|
||||
|
|
@ -32,15 +32,16 @@ namespace Server.Engines.PartySystem
|
|||
return;
|
||||
}
|
||||
|
||||
var length = GetPartyMemberListPacketLength(p);
|
||||
var count = p.Count;
|
||||
var length = GetPartyMemberListPacketLength(count);
|
||||
var writer = new SpanWriter(buffer);
|
||||
writer.Write((byte)0xBF); // Packet ID
|
||||
writer.Write((ushort)length);
|
||||
writer.Write((ushort)0x06); // Sub-packet
|
||||
writer.Write((byte)0x01); // Command
|
||||
writer.Write((byte)p.Count);
|
||||
writer.Write((byte)count);
|
||||
|
||||
for (var i = 0; i < p.Count; ++i)
|
||||
for (var i = 0; i < count; ++i)
|
||||
{
|
||||
writer.Write(p[i].Mobile.Serial);
|
||||
}
|
||||
|
|
@ -53,14 +54,14 @@ namespace Server.Engines.PartySystem
|
|||
return;
|
||||
}
|
||||
|
||||
Span<byte> buffer = stackalloc byte[GetPartyMemberListPacketLength(p)];
|
||||
Span<byte> buffer = stackalloc byte[GetPartyMemberListPacketLength(p.Count)];
|
||||
CreatePartyMemberList(buffer, p);
|
||||
|
||||
ns.Send(buffer);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static int GetPartyRemoveMemberPacketLength(Party p) => 11 + (p?.Count * 4 ?? 0);
|
||||
public static int GetPartyRemoveMemberPacketLength(int partyCount) => 11 + partyCount * 4;
|
||||
|
||||
public static void SendPartyRemoveMember(this NetState ns, Serial m, Party p = null)
|
||||
{
|
||||
|
|
@ -69,7 +70,7 @@ namespace Server.Engines.PartySystem
|
|||
return;
|
||||
}
|
||||
|
||||
Span<byte> buffer = stackalloc byte[GetPartyRemoveMemberPacketLength(p)];
|
||||
Span<byte> buffer = stackalloc byte[GetPartyRemoveMemberPacketLength(p?.Count ?? 0)];
|
||||
CreatePartyRemoveMember(buffer, m, p);
|
||||
|
||||
ns.Send(buffer);
|
||||
|
|
@ -82,14 +83,14 @@ namespace Server.Engines.PartySystem
|
|||
return;
|
||||
}
|
||||
|
||||
var length = GetPartyRemoveMemberPacketLength(p);
|
||||
var count = p?.Count ?? 0;
|
||||
var length = GetPartyRemoveMemberPacketLength(count);
|
||||
var writer = new SpanWriter(buffer);
|
||||
writer.Write((byte)0xBF); // Packet ID
|
||||
writer.Write((ushort)length);
|
||||
writer.Write((ushort)0x06); // Sub-packet
|
||||
writer.Write((byte)0x02); // Command
|
||||
|
||||
var count = p?.Count ?? 0;
|
||||
writer.Write((byte)count);
|
||||
writer.Write(removed);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue