JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflitchs... Yey

Browse Source
This commit is contained in:
Morten 2015-12-12 00:12:05 +01:00
parent 5ca997f2a8
commit 2626e1869b
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
View File

@ -3,7 +3,10 @@
>>>>>>>=6983af944fff04c5910f789266ae46b9eca4cc8d >>>>>>>=6983af944fff04c5910f789266ae46b9eca4cc8d
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
<<<<<<< HEAD
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate 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.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.compliance=1.8

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
View File

@ -88,6 +88,7 @@ public class PerkCowAngryHerd extends SmashPerk
loc.add(UtilAlg.getLeft(dir).multiply(i*1.5)); loc.add(UtilAlg.getLeft(dir).multiply(i*1.5));
Manager.GetGame().CreatureAllowOverride = true; Manager.GetGame().CreatureAllowOverride = true;
<<<<<<< HEAD
if(isSuperActive(player)) if(isSuperActive(player))
{ {
cow = player.getWorld().spawn(loc, MushroomCow.class); cow = player.getWorld().spawn(loc, MushroomCow.class);
@ -96,6 +97,10 @@ public class PerkCowAngryHerd extends SmashPerk
{ {
cow = player.getWorld().spawn(loc, Cow.class); 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; Manager.GetGame().CreatureAllowOverride = false;
_active.add(new DataCowCharge(player, cow)); _active.add(new DataCowCharge(player, cow));