TeraProxy лет назад: 9
Родитель
Сommit
3a5e7db462
2 измененных файлов с 5 добавлено и 1 удалено
  1. 2 0
      README.md
  2. 3 1
      index.js

+ 2 - 0
README.md

@@ -18,6 +18,8 @@ The script makes sure that you are not dead, mounted, in a battleground or in a
 Contains code from true-everful-nostrum by Pinkie Pie https://github.com/pinkipi  
 Contains code from true-everful-nostrum by Pinkie Pie https://github.com/pinkipi  
   
   
 ## Changelog
 ## Changelog
+### 1.2.2
+* [*] Fixed trying to use CCB when players already have the new Elite CCB running
 ### 1.2.1
 ### 1.2.1
 * [*] Full conversion to Pinkie Pie's command module
 * [*] Full conversion to Pinkie Pie's command module
 ### 1.2.0
 ### 1.2.0

+ 3 - 1
index.js

@@ -1,3 +1,4 @@
+// Version 1.2.2
 // Contains code from true-everful-nostrum by Pinkie Pie https://github.com/pinkipi
 // Contains code from true-everful-nostrum by Pinkie Pie https://github.com/pinkipi
 const Command = require('command')
 const Command = require('command')
 
 
@@ -5,6 +6,7 @@ const ITEMS_NOSTRUM = 184659, // EU 152898, NA 184659, RU 201005
 	BUFF_NOSTRUM_TD = 4030,
 	BUFF_NOSTRUM_TD = 4030,
 	BUFF_NOSTRUM_H = 4031,
 	BUFF_NOSTRUM_H = 4031,
 	BUFF_CCB = 4610,
 	BUFF_CCB = 4610,
+	BUFF_ConCB = 5020003,
 	RANDOM_MIN_MAX = [600000, 1500000], // Random Nostrum reapplication time between 10 and 25 minutes
 	RANDOM_MIN_MAX = [600000, 1500000], // Random Nostrum reapplication time between 10 and 25 minutes
 	RANDOM_SHORT = [15000, 20000] // Random Nostrum reapplication time after loading screen between 15 and 20 seconds
 	RANDOM_SHORT = [15000, 20000] // Random Nostrum reapplication time after loading screen between 15 and 20 seconds
 
 
@@ -89,7 +91,7 @@ module.exports = function Essentials(dispatch) {
 				nostrum()
 				nostrum()
 			}
 			}
 		}
 		}
-		if(event.target.equals(cid) && (event.id == BUFF_CCB)) {
+		if(event.target.equals(cid) && (event.id == BUFF_CCB || event.id == BUFF_ConCB)) {
 			if (type == 'S_ABNORMALITY_BEGIN') {
 			if (type == 'S_ABNORMALITY_BEGIN') {
 				hasccb = true
 				hasccb = true
 			}
 			}