From 2626e1869bcc21625574980d5048b2de2c94b126 Mon Sep 17 00:00:00 2001
From: Morten <unconfigured@null.spigotmc.org>
Date: Sat, 12 Dec 2015 00:12:05 +0100
Subject: [PATCH] Merge conflitchs... Yey

---
 .../.settings/org.eclipse.jdt.core.prefs                     | 3 +++
 .../game/arcade/game/games/smash/perks/PerkCowAngryHerd.java | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
index 71b91dfb8..258ba4736 100644
--- a/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
+++ b/Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
@@ -3,7 +3,10 @@
 >>>>>>>=6983af944fff04c5910f789266ae46b9eca4cc8d
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+<<<<<<< HEAD
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+=======
+>>>>>>> 1a922da1c39379beebab0abe3df78c9b8f66d64e
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
index 8955ff56c..16fce1fdf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
@@ -88,6 +88,7 @@ public class PerkCowAngryHerd extends SmashPerk
 			loc.add(UtilAlg.getLeft(dir).multiply(i*1.5));
 			
 			Manager.GetGame().CreatureAllowOverride = true;
+<<<<<<< HEAD
 			if(isSuperActive(player))
 			{
 				cow = player.getWorld().spawn(loc, MushroomCow.class);
@@ -96,6 +97,10 @@ public class PerkCowAngryHerd extends SmashPerk
 			{
 				cow = player.getWorld().spawn(loc, Cow.class);
 			}
+=======
+			Class<? extends Cow> clazz = isSuperActive(player) ? MushroomCow.class : Cow.class;
+			Cow cow = player.getWorld().spawn(loc, clazz);
+>>>>>>> 1a922da1c39379beebab0abe3df78c9b8f66d64e
 			Manager.GetGame().CreatureAllowOverride = false;
 			
 			_active.add(new DataCowCharge(player, cow));