From fb542beb55b18b3fdca9e267a6f8f8bab610950e Mon Sep 17 00:00:00 2001
From: IrcDirk <ircdirk@gmail.com>
Date: Wed, 18 Sep 2024 21:49:56 +0200
Subject: [PATCH] Fix issue #274. Fix issue
 https://github.com/mikepauer/Carbonite.Quests/issues/117 and many other
 problems with Quest module.

---
 Carbonite.lua | 5 +++++
 NxMap.lua     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Carbonite.lua b/Carbonite.lua
index d15448b..0ccd79d 100644
--- a/Carbonite.lua
+++ b/Carbonite.lua
@@ -146,6 +146,11 @@ Nx.Whatsnew.Maps = {
 Nx.Whatsnew.WhichCat = 1
 Nx.Whatsnew.HasWhatsNew = nil
 
+-- FIX TO PREVENT INTEGER OVERFLOW IN C
+bit.rshift = function(n, r)
+	return math.floor(n / math.pow(2, r)) % math.pow(2, 32)
+end;
+
 function GetCurrencyInfo(_type)
 
 	if _type == 390 then
diff --git a/NxMap.lua b/NxMap.lua
index 6f95e44..1341555 100644
--- a/NxMap.lua
+++ b/NxMap.lua
@@ -8678,7 +8678,7 @@ function Nx.Map:IconOnMouseDown (button)
 				end
 
 			else
-				if map.ClickIcon.iconType == "!RSR" and RareScanner then
+				if map.ClickIcon and map.ClickIcon.iconType == "!RSR" and RareScanner then
 					local rspin = this.NXData.UData
 					if not rspin.owningMap then
 						rspin.owningMap = WorldMapFrame