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

Fix: Müllsack aus dem Fahrzeug aufheben

Browse Source
This commit is contained in:
VegaZ
2021-02-14 15:36:51 +01:00
parent 6067c12a58
commit c73bc7a481
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ReallifeGamemode.Client/Jobs/RefuseCollector.ts
View File

@@ -66,25 +66,30 @@
//mp.events.callRemote('CLIENT:ImShape', JSON.stringify(Shape)); //mp.events.callRemote('CLIENT:ImShape', JSON.stringify(Shape));
for (var i = 0; i < ShapeTonne.length; i++) { for (var i = 0; i < ShapeTonne.length; i++) {
if (Shape != ShapeTonne[i]) continue; if (Shape != ShapeTonne[i]) continue;
if (!Traegt) { if (!mp.players.local.vehicle) {
if (!HintenVoll) { if (!Traegt) {
mp.events.callRemote('CLIENT:MuellmannImShape', i); if (!HintenVoll) {
Traegt = true; mp.events.callRemote('CLIENT:MuellmannImShape', i);
BlipTonne[i].destroy(); Traegt = true;
BlipTonne[i] = null; BlipTonne[i].destroy();
ShapeTonne[i].destroy(); BlipTonne[i] = null;
ShapeTonne[i] = null; ShapeTonne[i].destroy();
ShapeTonne[i] = null;
interval = setInterval(function () { createMarker(); }, 2); interval = setInterval(function () { createMarker(); }, 2);
}
else {
mp.gui.chat.push("Der Müllwagen ist bereits voll! Fahre zur Base und lade ab!");
return;
}
} }
else { else {
mp.gui.chat.push("Der Müllwagen ist bereits voll! Fahre zur Base und lade ab!"); mp.gui.chat.push(`Du trägst bereits einen Müllsack!`);
return; return;
} }
} }
else { else {
mp.gui.chat.push(`Du trägst bereits einen Müllsack!`); mp.events.call("renderTextOnScreen", "Steige aus dem Müllwagen aus um den Müllsack zu entnehmen.");
return;
} }
} }
if (Shape == ShapeTonneHinten) { if (Shape == ShapeTonneHinten) {

5
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -202,11 +202,6 @@ namespace ReallifeGamemode.Server.Job
[RemoteEvent("CLIENT:MuellmannImShape")] [RemoteEvent("CLIENT:MuellmannImShape")]
public void MuellmannImShape(Player player, int colshapeIndex) public void MuellmannImShape(Player player, int colshapeIndex)
{ {
if (player.IsInVehicle)
{
return;
}
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;