warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Scripts/Multis/HouseFoundation.cs
View file

@ -268,7 +268,7 @@ namespace Server.Multis
{
Item item = Fixtures[i];
if (Doors.Contains(item))
if (item is BaseDoor door && Doors.Contains(door))
continue;
item.MoveToWorld(new Point3D(item.X + x, item.Y + y, item.Z + z), Map);
@ -301,8 +301,11 @@ namespace Server.Multis
for (int i = 0; i < Fixtures.Count; ++i)
{
Fixtures[i].Delete();
Doors.Remove(Fixtures[i]);
Item item = Fixtures[i];
item.Delete();
if (item is BaseDoor door)
Doors.Remove(door);
}
Fixtures.Clear();
@ -1698,7 +1701,7 @@ namespace Server.Multis
Mobile from = state.Mobile;
DesignContext context = DesignContext.Find(from);
if (World.FindItem(pvSrc.ReadInt32()) is HouseFoundation foundation && from.Map == foundation.Map && from.InRange(foundation.GetWorldLocation(), 24) &&
if (World.FindItem(pvSrc.ReadUInt32()) is HouseFoundation foundation && from.Map == foundation.Map && from.InRange(foundation.GetWorldLocation(), 24) &&
from.CanSee(foundation))
{
DesignState stateToSend;
@ -2274,7 +2277,7 @@ namespace Server.Multis
m_Thread.Start();
}
public DesignStateDetailed(int serial, int revision, int xMin, int yMin, int xMax, int yMax, MultiTileEntry[] tiles)
public DesignStateDetailed(uint serial, int revision, int xMin, int yMin, int xMax, int yMax, MultiTileEntry[] tiles)
: base(0xD8)
{
EnsureCapacity(17 + tiles.Length * 5);
@ -2408,7 +2411,7 @@ namespace Server.Multis
int planeCount = 0;
byte[] m_DeflatedBuffer = null;
byte[] m_DeflatedBuffer;
lock (m_DeflatedBufferPool)
{
m_DeflatedBuffer = m_DeflatedBufferPool.AcquireBuffer();
@ -2520,6 +2523,16 @@ namespace Server.Multis
m_Stream.UnderlyingStream.Write(m_PrimBuffer, 0, 4);
}
public void Write(uint value)
{
m_PrimBuffer[0] = (byte)(value >> 24);
m_PrimBuffer[1] = (byte)(value >> 16);
m_PrimBuffer[2] = (byte)(value >> 8);
m_PrimBuffer[3] = (byte)value;
m_Stream.UnderlyingStream.Write(m_PrimBuffer, 0, 4);
}
public void Write(short value)
{
@ -2633,7 +2646,8 @@ namespace Server.Multis
{
public NetState m_NetState;
public DesignState m_Root;
public int m_Serial, m_Revision;
public int m_Revision;
public uint m_Serial;
public MultiTileEntry[] m_Tiles;
public int m_xMin, m_yMin, m_xMax, m_yMax;