Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

This commit is contained in:
michael.reiswich
2021-04-02 16:48:10 +02:00
15 changed files with 2152 additions and 78 deletions

View File

@@ -57,6 +57,7 @@ cityHall(globalData);
import adminSpeed from './admin/aspeed';
adminSpeed();
import voice from './Voice/main';
voice(globalData);

View File

@@ -263,9 +263,9 @@
self.attacker = null;
//self.blip.setFlashes(false);
mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false);
self.blip.destroy();
//self.blip.destroy();
self.setColor(self.owner);
self.blip.setColour(self.color);
//self.blip.setColour(self.color);
mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color);
self.setLeaderColShape();
return;