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

fix: Fixes drag drop bounce issue (#1040)

Browse source
This commit is contained in:
Kamron Batman 2022-05-30 15:47:06 -07:00 • committed by GitHub
parent aeec7f78fd
commit 98a74a89c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/Server/Items/Item.cs
View file

@ -2074,9 +2074,12 @@ namespace Server
MoveToWorld(from.Location, from.Map); MoveToWorld(from.Location, from.Map);
} }
} }
else if ((parent as Mobile)?.EquipItem(this) == false) else if (parent is Mobile mobile)
{ {
MoveToWorld(bounce.WorldLoc, bounce.Map); if (!mobile.EquipItem(this))
{
MoveToWorld(bounce.WorldLoc, bounce.Map);
}
} }
else else
{ {

44
Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs
View file

@ -564,35 +564,37 @@ namespace Server.Items
public override bool OnDragDrop(Mobile from, Item dropped) public override bool OnDragDrop(Mobile from, Item dropped)
{ {
if (dropped is SpellScroll scroll && scroll.Amount == 1) if (dropped is not SpellScroll { Amount: 1 } scroll)
{ {
var type = GetTypeForSpell(scroll.SpellID); return false;
}
if (type != SpellbookType) var type = GetTypeForSpell(scroll.SpellID);
{
return false;
}
if (HasSpell(scroll.SpellID)) if (type != SpellbookType)
{ {
from.SendLocalizedMessage(500179); // That spell is already present in that spellbook. return false;
return false; }
}
var val = scroll.SpellID - BookOffset; if (HasSpell(scroll.SpellID))
{
from.SendLocalizedMessage(500179); // That spell is already present in that spellbook.
return false;
}
if (val >= 0 && val < BookCount) var val = scroll.SpellID - BookOffset;
{
m_Content |= (ulong)1 << val;
++SpellCount;
InvalidateProperties(); if (val >= 0 && val < BookCount)
{
m_Content |= (ulong)1 << val;
++SpellCount;
scroll.Delete(); InvalidateProperties();
from.SendSound(0x249, GetWorldLocation()); scroll.Delete();
return true;
} from.SendSound(0x249, GetWorldLocation());
return true;
} }
return false; return false;