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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Projects/Scripts/Regions/GuardedRegion.cs
View file

@ -90,14 +90,17 @@ namespace Server.Regions
GuardedRegion reg = from.Region.GetRegion<GuardedRegion>();
if (reg == null)
{
from.SendMessage("You are not in a guardable region.");
}
else
{
reg.Disabled = !e.GetBoolean(0);
from.SendMessage(reg.Disabled
? "The guards in this region have been disabled."
: "The guards in this region have been enabled.");
if (reg.Disabled)
from.SendMessage("The guards in this region have been disabled.");
else
from.SendMessage("The guards in this region have been enabled.");
}
}
else
@ -190,6 +193,12 @@ namespace Server.Regions
CheckGuardCandidate(m);
}
public override void OnExit(Mobile m)
{
// if (IsDisabled())
return;
}
public override void OnSpeech(SpeechEventArgs args)
{
base.OnSpeech(args);

4
Projects/Scripts/Regions/Spawning/SpawnEntry.cs
View file

@ -264,7 +264,9 @@ namespace Server.Regions
if (entity != null)
{
m_RemoveList ??= new List<IEntity>();
if (m_RemoveList == null)
m_RemoveList = new List<IEntity>();
m_RemoveList.Add(entity);
}
}

5
Projects/Scripts/Regions/Spawning/SpawnPersistence.cs
View file

@ -15,7 +15,8 @@ namespace Server.Regions
public static void EnsureExistence()
{
m_Instance ??= new SpawnPersistence();
if (m_Instance == null)
m_Instance = new SpawnPersistence();
}
public override void Serialize(GenericWriter writer)
@ -53,4 +54,4 @@ namespace Server.Regions
}
}
}
}
}