From e00adfef81be209cab06bc55590b8172da5ec4f7 Mon Sep 17 00:00:00 2001
From: Limestone <jgoog999@gmail.com>
Date: Sun, 7 Aug 2016 17:28:15 +0800
Subject: [PATCH] Fixes issue https://github.com/rathena/rathena/issues/1482

---
 npc/merchants/ammo_boxes.txt  | 5 +++--
 npc/merchants/ammo_dealer.txt | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 797d5865b2..47d50b2d71 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 2.0
+//= 2.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
@@ -17,11 +17,12 @@
 //= 1.4 Updated to match AEGIS script again. [Masao]
 //= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
 //= 2.0 Clean-up. [Capuche]
+//= 2.1 Fixes Issue #1482, where Rebellion jobs cannot use this npc. [Limestone]
 //============================================================
 
 alberta,118,157,3	script	Magazine Dealer Kenny::mdk	4_M_01,{
 	mes "[Kenny]";
-	if (BaseJob == Job_Gunslinger) {
+	if (BaseClass == Job_Gunslinger) {
 		mes "Welcome to my Magazine Shop.";
 		mes "As you may know, large numbers";
 		mes "of bullets can be carried more";
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index c4f00ab6a5..205839d921 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Playtester, Paradox924X
 //===== Version ==============================================
-//= 2.0
+//= 2.1
 //===== Compatible With ======================================
 //= rAthena Project
 //===== Description ==========================================
@@ -18,11 +18,12 @@
 //= 1.5 Updated to match AEGIS script again. [Masao]
 //= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy]
 //= 2.0 Clean-up. [Capuche]
+//= 2.1 Fixes Issue #1482, where Rebellion jobs cannot use this npc. [Limestone]
 //============================================================
 
 alberta,118,160,3	script	Bullet Dealer Tony#alb::bdt	4_M_04,{
 	mes "[Tony]";
-	if (BaseJob == Job_Gunslinger) {
+	if (BaseClass == Job_Gunslinger) {
 		mes "I'm Tony, the Bullet Dealer.";
 		mes "Come to me whenever you're";
 		mes "short on ammo. Just bring me";