Revert "nodmzone, COMMIT NUR ZUM TESTEN"

This reverts commit 3edd6b5560
This commit is contained in:
hydrant
2021-04-21 23:14:14 +02:00
parent 556f270b06
commit 9459cd9ed3
7 changed files with 1 additions and 59 deletions

View File

@@ -16,7 +16,6 @@ export default function (globalData: IGlobalData): void {
var adutyMode = false; var adutyMode = false;
var adminUnshow = false; var adminUnshow = false;
var adminTSupport = false; var adminTSupport = false;
var noDmZone = false;
var dutyMode = false; var dutyMode = false;
let jailTime = 0; let jailTime = 0;
let att_score = 0; let att_score = 0;
@@ -85,10 +84,6 @@ export default function (globalData: IGlobalData): void {
blackScreenMode = toggle; blackScreenMode = toggle;
}); });
mp.events.add("toggleNoDmZone", (toggle) => {
noDmZone = toggle;
});
mp.events.add("jailTime", (time) => { mp.events.add("jailTime", (time) => {
jailTime = JSON.parse(time); jailTime = JSON.parse(time);
}); });
@@ -350,17 +345,6 @@ export default function (globalData: IGlobalData): void {
}) })
} }
if (noDmZone) {
mp.game.graphics.drawText("~r~NoDM Zone", [0.907, 0.741],
{
font: 4,
color: [255, 255, 255, 255],
scale: [0.8, 0.8],
outline: true,
centre: false
})
}
if (countdown > 0) { if (countdown > 0) {
var now = Date.now(); var now = Date.now();
var diff = Math.trunc((now - cdTimestamp) / 1000); var diff = Math.trunc((now - cdTimestamp) / 1000);

View File

@@ -1,22 +0,0 @@

export function isPlayerInNoDMZone(pos) {
if (pos.x >= -540 && pos.x <= -531
&& pos.y >= -2151 && pos.y <= -2139) {
return true;
}
return false;
}
export default function positionHandler() {
mp.events.add("checkPosition", (targetEntity) => {
if (isPlayerInNoDMZone(mp.players.local.position) || isPlayerInNoDMZone(targetEntity.position)) {
mp.gui.chat.push("Kein DM in NODM!");
}
});
setInterval(() => {
mp.events.call('toggleNoDmZone', isPlayerInNoDMZone(mp.players.local.position));
}, 200);
}

View File

@@ -39,6 +39,7 @@ export default function reportList(globalData: IGlobalData) {
//Weapon Menu //Weapon Menu
mp.events.add('showReportMenu', (userTickets, TicketsArr) => { mp.events.add('showReportMenu', (userTickets, TicketsArr) => {
if (!globalData.InMenu) { if (!globalData.InMenu) {

View File

@@ -186,9 +186,6 @@ ped();
import reportList from './Player/reportmenu'; import reportList from './Player/reportmenu';
reportList(globalData); reportList(globalData);
import positionHandler from './Player/position';
positionHandler();
import checkpointHandle from './util/checkpoint'; import checkpointHandle from './util/checkpoint';
checkpointHandle(globalData); checkpointHandle(globalData);

View File

@@ -7,12 +7,6 @@
player.setSuffersCriticalHits(false); player.setSuffersCriticalHits(false);
}); });
mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => {
mp.events.call('checkPosition', targetEntity);
});
mp.events.add("render", () => { mp.events.add("render", () => {
if (blockInput) { if (blockInput) {
mp.game.controls.disableControlAction(32, 142, true); mp.game.controls.disableControlAction(32, 142, true);

View File

@@ -17,13 +17,6 @@ namespace ReallifeGamemode.Server.Commands
{ {
internal class UserCommands : Script internal class UserCommands : Script
{ {
[Command("nodm", "~m~nodm")]
public void CmdUserNoDm(Player player)
{
ChatService.Broadcast("ss");
player.TriggerEvent("toggleNoDmZone", true);
}
[Command("look", "~m~look")] [Command("look", "~m~look")]
public void CmdUserLook(Player player) public void CmdUserLook(Player player)
{ {

View File

@@ -9,11 +9,6 @@ namespace ReallifeGamemode.Server.Events
{ {
internal class PlayerEvent : Script internal class PlayerEvent : Script
{ {
[ServerEvent(Event.PlayerDamage)]
public void OnPlayerDamage(Player player, float healthLoss, float armorLoss) {
ChatService.Broadcast("dmg");
}
[RemoteEvent("CLIENT:SET_InFrontOfPos")] [RemoteEvent("CLIENT:SET_InFrontOfPos")]
public void SetFrontOfPos(Player player, Vector3 pos) public void SetFrontOfPos(Player player, Vector3 pos)
{ {