SaltyMonkey лет назад: 6
Родитель
Сommit
44cbb853ac
3 измененных файлов с 6 добавлено и 4 удалено
  1. 4 2
      data/protoData.json
  2. 1 1
      lib/unitFps.js
  3. 1 1
      lib/unitState.js

+ 4 - 2
data/protoData.json

@@ -37,13 +37,15 @@
 		"default": 3
 	},
 	"S_SPAWN_USER": {
-		"default": 15
+		"default": 15,
+		"99": 16
 	},
 	"S_DESPAWN_USER": {
 		"default": 3
 	},
 	"S_SPAWN_DROPITEM": {
-		"default": 8
+		"default": 8,
+		"99": 9
 	},
 	"S_DESPAWN_DROPITEM": {
 		"default": 4

+ 1 - 1
lib/unitFps.js

@@ -51,7 +51,7 @@ class unitFps {
 				if (data.activeMode.blockPlayersAppearance.allTitles) { res.event.title = 0; res.returnState = true; }
 				if (data.activeMode.blockPlayersAppearance.icons) { res.event.icons = []; res.returnState = true; }
 				if (data.activeMode.blockPlayersAppearance.allLook) {
-					res.event.weapon = [10001, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 80396, 55005, 82005, 58171, 59053][res.event.templateId % 100 - 1]; //temp fix from Risenio fps utils TODO: remove hardcoded ids
+					res.event.weapon = [10001, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 80396, 55005, 82005, 58171, 59053][res.event.templateId % 100 - 1] || 0; //temp fix from Risenio fps utils TODO: remove hardcoded ids
 					res.event.showFace = false;
 					res.event.showStyle = false;
 					res.event.styleHead = 0;

+ 1 - 1
lib/unitState.js

@@ -100,7 +100,7 @@ class unitState extends EventEmitter {
 		this.__mod.hook("S_LOGIN", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
 			this.lockedMode = false;
 
-			if(this.__mod.manager.isLoaded("shaker")) {
+			if(this.__mod.manager.isLoaded("camera-control")) {
 				this.__mod.log("Camera shake effects will not be applied as the Shaker mod is installed. Please use \"/toolbox shaker\" to configure camera shaking behavior");
 				this.externalShakeControl = true;
 			}