aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix I O M"

Browse Source 
This reverts commit 895136bc72
This commit is contained in:
hydrant
2021-04-03 20:08:39 +02:00
parent 8abec2866a
commit ee305b78ec
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/Gui/playerlist.ts
View File

@@ -15,13 +15,11 @@ export default function playerList(globalData: IGlobalData): void {
playerlistBrowser.destroy(); playerlistBrowser.destroy();
playerlistBrowser = null; playerlistBrowser = null;
globalData.InInput = false; globalData.InInput = false;
globalData.InMenu = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
mp.gui.chat.activate(true); mp.gui.chat.activate(true);
} }
else if (!globalData.InMenu) { else if (!globalData.InInput) {
globalData.InInput = true; globalData.InInput = true;
globalData.InMenu = true;
playerlistBrowser = mp.browsers.new('package://assets/html/Playerlist/Tabliste.html'); playerlistBrowser = mp.browsers.new('package://assets/html/Playerlist/Tabliste.html');
mp.gui.chat.activate(false); mp.gui.chat.activate(false);
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);

6
ReallifeGamemode.Client/inventory/inventory.ts
View File

@@ -16,14 +16,12 @@
invBrowser.destroy() invBrowser.destroy()
invBrowser = null; invBrowser = null;
globalData.InInput = false; globalData.InInput = false;
globalData.InMenu = false;
loaded = false; loaded = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
return; return;
} }
if (!globalData.InMenu) { if (!globalData.InInput) {
globalData.InInput = true; globalData.InInput = true;
globalData.InMenu = true;
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
itemArr = []; itemArr = [];
vehItemArr = []; vehItemArr = [];
@@ -39,7 +37,6 @@
mp.events.add('openInventory', () => { mp.events.add('openInventory', () => {
globalData.InInput = true; globalData.InInput = true;
globalData.InMenu = true;
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
itemArr = []; itemArr = [];
vehItemArr = []; vehItemArr = [];
@@ -49,7 +46,6 @@
invBrowser.destroy() invBrowser.destroy()
invBrowser = null; invBrowser = null;
globalData.InInput = false; globalData.InInput = false;
globalData.InMenu = false;
loaded = false; loaded = false;
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
return; return;

9
ReallifeGamemode.Client/util/attachmentMngr.ts
View File

@@ -32,9 +32,15 @@ export default function attachmentManager(game: IGame) {
} else if (entityRage.type === "vehicle") { } else if (entityRage.type === "vehicle") {
var vehicle = game.vehicles.at(entityRage.remoteId); var vehicle = game.vehicles.at(entityRage.remoteId);
entity = vehicle; entity = vehicle;
var realName = mp.game.ui.getLabelText(mp.game.vehicle.getDisplayNameFromVehicleModel(entityRage.model));
} else if (entityRage.type === "object") {
return;
} }
let e = game.attachments.get(entity); let e = game.attachments.get(entity);
if (this.attachments.hasOwnProperty(id)) { if (this.attachments.hasOwnProperty(id)) {
@@ -59,7 +65,7 @@ export default function attachmentManager(game: IGame) {
rotation: attInfo.rotation rotation: attInfo.rotation
}; };
game.objects.setData(rageObject, attachmentData); game.objects.setData(rageObject, attachmentData); // hier hakt es mein freund
let object = game.objects.at(rageObject.remoteId); let object = game.objects.at(rageObject.remoteId);
@@ -258,6 +264,7 @@ export default function attachmentManager(game: IGame) {
if (e != null) { if (e != null) {
if (e.__attachmentObjects) { if (e.__attachmentObjects) {
//game.wait(2500);
attachmentMngr.shutdownFor(entityRage); attachmentMngr.shutdownFor(entityRage);
} }
} }