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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Scripts/Holiday Stuff/Halloween/2009/Engines/PumpkinPatch.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Linq;
using Server.Events.Halloween;
using Server.Items;
@ -41,18 +42,10 @@ namespace Server.Engines.Events
Rectangle2D rect = m_PumpkinFields[i];
int spawncount = rect.Height * rect.Width / 20;
int pumpkins = 0;
foreach (Item item in map.GetItemsInBounds(rect))
if (item is HalloweenPumpkin)
pumpkins++;
int pumpkins = map.GetItemsInBounds(rect).OfType<HalloweenPumpkin>().Count();
if (spawncount > pumpkins)
{
Item item = new HalloweenPumpkin();
item.MoveToWorld(RandomPointIn(rect, map), map);
}
new HalloweenPumpkin().MoveToWorld(RandomPointIn(rect, map), map);
}
}
@ -65,4 +58,4 @@ namespace Server.Engines.Events
return new Point3D(x, y, z);
}
}
}
}

5
Scripts/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs
View file

@ -8,8 +8,7 @@
public class CreepyCake : Food
{
[Constructible]
public CreepyCake()
: base(0x9e9)
public CreepyCake() : base(0x9e9, 1)
{
Hue = 0x3E4;
}
@ -35,4 +34,4 @@
int version = reader.ReadInt();
}
}
}
}

5
Scripts/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs
View file

@ -3,8 +3,7 @@
public class MrPlainsCookies : Food
{
[Constructible]
public MrPlainsCookies()
: base(0x160C)
public MrPlainsCookies() : base(0x160C, 1)
{
Weight = 1.0;
FillFactor = 4;
@ -32,4 +31,4 @@
int version = reader.ReadInt();
}
}
}
}