From 7c81bb3db578372419a8b481f797f408193529d0 Mon Sep 17 00:00:00 2001 From: nahkampfaffe Date: Wed, 19 Sep 2018 02:43:01 +0200 Subject: [PATCH 1/4] =?UTF-8?q?PlayerDeath-Event=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +++- Server/Events/Death.cs | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Server/Events/Death.cs diff --git a/.gitignore b/.gitignore index 5e25bec6..db52e9bd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,6 @@ Properties/* *.user !.gitkeep -yolo/* \ No newline at end of file +yolo/* +/mycmds.cs +/Server/Commands/mycmds.cs diff --git a/Server/Events/Death.cs b/Server/Events/Death.cs new file mode 100644 index 00000000..4ee26dbd --- /dev/null +++ b/Server/Events/Death.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using GTANetworkAPI; +using GTANetworkMethods; +using reallife_gamemode.Model; + +/* + * Author: balbo + * + * */ + +namespace reallife_gamemode.Server.Events +{ + public class Death : Script + { + [ServerEvent(GTANetworkAPI.Event.PlayerDeath)] + public void OnPlayerDeath(Client player, Client killer, uint reason) + { + NAPI.Chat.SendChatMessageToPlayer(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString()); + } + } +} From a75ba4cc3939359a0144123d5696781cb8474c5f Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 19 Sep 2018 19:59:11 +0200 Subject: [PATCH 2/4] Emptied Server/Managers/.gitkeep --- Server/Managers/.gitkeep | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Server/Managers/.gitkeep b/Server/Managers/.gitkeep index d66872d0..5f282702 100644 --- a/Server/Managers/.gitkeep +++ b/Server/Managers/.gitkeep @@ -1,10 +1 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace reallife_gamemode.Server.Managers -{ - class _ - { - } -} + \ No newline at end of file From 969537c655751ce42fb9d5bf05db9b1a7d3a81f4 Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 19 Sep 2018 20:03:44 +0200 Subject: [PATCH 3/4] Fixed Spawn class namespace --- Server/Events/Spawn.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/Events/Spawn.cs b/Server/Events/Spawn.cs index a11c5da6..dc5f3ca2 100644 --- a/Server/Events/Spawn.cs +++ b/Server/Events/Spawn.cs @@ -12,7 +12,7 @@ using reallife_gamemode.Model; * @copyright (c) 2008 - 2018 Life of German */ -namespace reallife_gamemode.Server.Event +namespace reallife_gamemode.Server.Events { public class Spawn : Script { From f4f4b897f076afdbff299c07239f510b27b34e97 Mon Sep 17 00:00:00 2001 From: hydrant Date: Wed, 19 Sep 2018 20:14:49 +0200 Subject: [PATCH 4/4] Cleaned up code (removed unnneccessary lines / words) --- Main.cs | 2 -- Server/Events/Connect.cs | 2 +- Server/Events/Death.cs | 2 +- Server/Events/Spawn.cs | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Main.cs b/Main.cs index f9e29611..e1aea960 100644 --- a/Main.cs +++ b/Main.cs @@ -11,8 +11,6 @@ namespace reallife_gamemode { public class Main : Script { - - [ServerEvent(Event.ResourceStart)] public void OnResourceStart() { diff --git a/Server/Events/Connect.cs b/Server/Events/Connect.cs index caa7ea4b..59167107 100644 --- a/Server/Events/Connect.cs +++ b/Server/Events/Connect.cs @@ -17,7 +17,7 @@ namespace reallife_gamemode.Server.Events { class Connect : Script { - [ServerEvent(GTANetworkAPI.Event.PlayerConnected)] + [ServerEvent(Event.PlayerConnected)] public void OnPlayerConnected(Client player) { diff --git a/Server/Events/Death.cs b/Server/Events/Death.cs index 4ee26dbd..4eaa85e0 100644 --- a/Server/Events/Death.cs +++ b/Server/Events/Death.cs @@ -15,7 +15,7 @@ namespace reallife_gamemode.Server.Events { public class Death : Script { - [ServerEvent(GTANetworkAPI.Event.PlayerDeath)] + [ServerEvent(Event.PlayerDeath)] public void OnPlayerDeath(Client player, Client killer, uint reason) { NAPI.Chat.SendChatMessageToPlayer(player, "Du bist durch " + killer.Name + " gestorben: " + reason.ToString()); diff --git a/Server/Events/Spawn.cs b/Server/Events/Spawn.cs index dc5f3ca2..02d3d38a 100644 --- a/Server/Events/Spawn.cs +++ b/Server/Events/Spawn.cs @@ -17,7 +17,7 @@ namespace reallife_gamemode.Server.Events public class Spawn : Script { - [ServerEvent(GTANetworkAPI.Event.PlayerSpawn)] + [ServerEvent(Event.PlayerSpawn)] public void OnPlayerSpawn(Client player) {