Remove fast regen and fix obs playing sounds when attacking

twizmwazin · Mar 25, 2016 · c1232cc · c1232cc
1 parent 19d5a70
commit c1232cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 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
@@ -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
@@ -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
@@ -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()) {