From c1232ccebc814721b4daa00f5e99596e1a163b70 Mon Sep 17 00:00:00 2001
From: Pablete1234 <pabloherrerapalacio@gmail.com>
Date: Fri, 25 Mar 2016 05:24:04 +0100
Subject: [PATCH] Remove fast regen and fix obs playing sounds when attacking

---
 .../cardinal/module/modules/observers/ObserverModule.java | 8 ++++++++
 .../module/modules/scoreboard/ScoreboardModule.java       | 2 +-
 src/main/java/in/twizmwaz/cardinal/util/Players.java      | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/in/twizmwaz/cardinal/module/modules/observers/ObserverModule.java b/src/main/java/in/twizmwaz/cardinal/module/modules/observers/ObserverModule.java
index 67552272c..2d942c49a 100644
--- a/src/main/java/in/twizmwaz/cardinal/module/modules/observers/ObserverModule.java
+++ b/src/main/java/in/twizmwaz/cardinal/module/modules/observers/ObserverModule.java
@@ -61,6 +61,7 @@
 import org.bukkit.event.inventory.InventoryCreativeEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.PlayerAttackEntityEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
@@ -514,6 +515,13 @@ public void onEntityAttack(EntityDamageByEntityEvent event) {
         }
     }
 
+    @EventHandler
+    public void onEntityAttack(PlayerAttackEntityEvent event) {
+        if (testObserver(event.getPlayer())) {
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler
     public void onVehicleDamage(VehicleDamageEvent event) {
         if (event.getAttacker() instanceof Player && testObserver((Player) event.getAttacker())) {
diff --git a/src/main/java/in/twizmwaz/cardinal/module/modules/scoreboard/ScoreboardModule.java b/src/main/java/in/twizmwaz/cardinal/module/modules/scoreboard/ScoreboardModule.java
index 1ad746d9e..fcbd650a8 100644
--- a/src/main/java/in/twizmwaz/cardinal/module/modules/scoreboard/ScoreboardModule.java
+++ b/src/main/java/in/twizmwaz/cardinal/module/modules/scoreboard/ScoreboardModule.java
@@ -111,7 +111,7 @@ public void unload() {
     public void onMatchStartEvent(MatchStartEvent event) {
         for (TeamModule team : Teams.getTeams()) {
             Team scoreboardTeam = scoreboard.getTeam(team.getId());
-            if (!team.isObserver()) scoreboardTeam.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.ALWAYS);
+            if (!team.isObserver()) scoreboardTeam.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER);
         }
     }
 
diff --git a/src/main/java/in/twizmwaz/cardinal/util/Players.java b/src/main/java/in/twizmwaz/cardinal/util/Players.java
index ca121a9ec..110f3fb90 100644
--- a/src/main/java/in/twizmwaz/cardinal/util/Players.java
+++ b/src/main/java/in/twizmwaz/cardinal/util/Players.java
@@ -38,6 +38,8 @@ public static void resetPlayer(Player player, boolean heal) {
         player.setWalkSpeed(0.2F);
         player.setFlySpeed(0.1F);
 
+        player.setFastNaturalRegeneration(false);
+
         for (Attribute attribute : Attribute.values()) {
             if (player.getAttribute(attribute) == null) continue;
             for (AttributeModifier modifier : player.getAttribute(attribute).getModifiers()) {