Fixes a crash when using auction house. and using hearth stone/teleporting.

This commit is contained in:
hondacrx
2022-11-05 17:55:37 -04:00
parent b5cd2f5422
commit bca92b80b9
3 changed files with 12 additions and 9 deletions
+4 -8
View File
@@ -1661,7 +1661,7 @@ namespace Game.Maps
return new TransferAbortParams(TransferAbortReason.MapNotAllowed);
if (!entry.IsDungeon())
return TransferAbortParams.None;
return null;
Difficulty targetDifficulty = player.GetDifficultyID(entry);
// Get the highest available difficulty if current setting is higher than the instance allows
@@ -1671,7 +1671,7 @@ namespace Game.Maps
//Bypass checks for GMs
if (player.IsGameMaster())
return TransferAbortParams.None;
return null;
//Other requirements
{
@@ -1702,7 +1702,7 @@ namespace Game.Maps
return new TransferAbortParams(TransferAbortReason.TooManyInstances);
}
return TransferAbortParams.None;
return null;
}
public string GetMapName()
@@ -3219,7 +3219,7 @@ namespace Game.Maps
return i_InstanceId;
}
public virtual TransferAbortParams CannotEnter(Player player) { return TransferAbortParams.None; }
public virtual TransferAbortParams CannotEnter(Player player) { return null; }
public Difficulty GetDifficultyID()
{
@@ -5219,8 +5219,6 @@ namespace Game.Maps
public class TransferAbortParams
{
public static TransferAbortParams None = new TransferAbortParams();
public TransferAbortReason Reason;
public byte Arg;
public uint MapDifficultyXConditionId;
@@ -5231,8 +5229,6 @@ namespace Game.Maps
Arg = arg;
MapDifficultyXConditionId = mapDifficultyXConditionId;
}
public bool IsFailed() { return Reason != TransferAbortReason.None; }
}
public struct ScriptAction
@@ -959,6 +959,13 @@ namespace Game.Networking.Packets
public static bool operator ==(ItemInstance left, ItemInstance right)
{
if (ReferenceEquals(left, right))
return true;
if (ReferenceEquals(left, null))
return false;
if (ReferenceEquals(right, null))
return false;
if (left.ItemID != right.ItemID)
return false;
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Scripts.Events.Midsummer
public const uint TorchCatchingA = 11657;
public const uint TorchCatchingH = 11923;
public const uint MoreTorchCatchingA = 11924;
public const uint MoreTorchCatchingH = 1192;
public const uint MoreTorchCatchingH = 11925;
}
[Script] // 45724 - Braziers Hit!