fixed some bugs

Author: GrafDimenzio

PvPArena/PvpArenaAddon.cs

@@ -8,23 +8,37 @@ public class PvpArenaAddon : IHubAddon
         [AddonConfig("PvPArena")]
         public HubAddonConfig Config { get; set; }
 
+        public void Reload() { }
+
         public void Load()
         {
-            Server.Get.Events.Player.PlayerItemUseEvent += ItemUse;
+            Server.Get.Events.Player.PlayerShootEvent += Shoot;
+            Server.Get.Events.Player.PlayerThrowGrenadeEvent += Throw;
+            Server.Get.Events.Player.PlayerUseMicroEvent += Micro;
         }
 
-        public void NewRound()
+        private void Micro(Synapse.Api.Events.SynapseEventArguments.PlayerUseMicroEventArgs ev)
         {
-            foreach (var holder in Config.ItemHolders)
-                new ItemHolder(holder.Item, holder.Teleporter);
+            if (!Config.PvpRooms.Contains(ev.Player.Room.RoomType))
+                ev.State = MicroHID.MicroHidState.Idle;
         }
 
-        public void Reload() { }
+        private void Throw(Synapse.Api.Events.SynapseEventArguments.PlayerThrowGrenadeEventArgs ev)
+        {
+            if (!Config.PvpRooms.Contains(ev.Player.Room.RoomType))
+                ev.Allow = false;
+        }
 
-        private void ItemUse(Synapse.Api.Events.SynapseEventArguments.PlayerItemInteractEventArgs ev)
+        private void Shoot(Synapse.Api.Events.SynapseEventArguments.PlayerShootEventArgs ev)
         {
-            if (Config.PvpRooms.Contains(ev.Player.Room.RoomType))
-                ev.Allow = true;
+            if (!Config.PvpRooms.Contains(ev.Player.Room.RoomType))
+                ev.Allow = false;
+        }
+
+        public void NewRound()
+        {
+            foreach (var holder in Config.ItemHolders)
+                new ItemHolder(holder.Item, holder.Teleporter);
         }
     }
 }

SLHub/CustomPluginConfig.cs

@@ -19,8 +19,11 @@ public class CustomPluginConfig : IConfigSection
         [Description("If players can drop Items")]
         public bool AllowDrop { get; set; } = false;
 
-        [Description("If players can shoot other players")]
-        public bool AllowItemUsage { get; set; } = false;
+        [Description("If Players can Escape")]
+        public bool AllowEscape { get; set; } = false;
+
+        [Description("If Roles should spawn with they Items")]
+        public bool SpawnWithItems { get; set; } = false;
 
         [Description("If all Doors should be locked")]
         public bool LockAllDoors { get; set; } = false;

SLHub/EventHandlers.cs

@@ -22,10 +22,18 @@ public EventHandlers(PluginClass pluginClass)
 
             Server.Get.Events.Round.WaitingForPlayersEvent += Waiting;
             Server.Get.Events.Player.PlayerDropItemEvent += Drop;
-            Server.Get.Events.Player.PlayerItemUseEvent += UseItem;
             Server.Get.Events.Round.RoundRestartEvent += Restart;
             Server.Get.Events.Player.PlayerLeaveEvent += Leave;
             Server.Get.Events.Player.PlayerDeathEvent += Death;
+            Server.Get.Events.Player.PlayerEscapesEvent += Escape;
+            Server.Get.Events.Player.PlayerSetClassEvent += SetClass;
+            Server.Get.Events.Player.PlayerDropAmmoEvent += DropAmmo;
+        }
+
+        private void SetClass(Synapse.Api.Events.SynapseEventArguments.PlayerSetClassEventArgs ev)
+        {
+            if (!Config.SpawnWithItems)
+                ev.Items.Clear();
         }
 
         public void Reload() => Config = Plugin.SYML.GetOrSetDefault("LobbyConfigs", new CustomPluginConfig());
@@ -45,6 +53,12 @@ private IEnumerator<float> Lobby()
             }
         }
 
+        private void Escape(Synapse.Api.Events.SynapseEventArguments.PlayerEscapeEventArgs ev)
+        {
+            if (!Config.AllowEscape)
+                ev.Allow = false;
+        }
+
         private void Waiting()
         {
             Map.Get.Round.RoundLock = true;
@@ -75,9 +89,9 @@ private void Drop(Synapse.Api.Events.SynapseEventArguments.PlayerDropItemEventAr
             }
         }
 
-        private void UseItem(Synapse.Api.Events.SynapseEventArguments.PlayerItemInteractEventArgs ev)
+        private void DropAmmo(Synapse.Api.Events.SynapseEventArguments.PlayerDropAmmoEventArgs ev)
         {
-            if (!Config.AllowItemUsage)
+            if (!Config.AllowDrop)
                 ev.Allow = false;
         }