TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 11:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Clean up Conflicts

Browse source 
Conflicts:
	src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java
	src/com/projectkorra/ProjectKorra/firebending/Lightning.java
This commit is contained in:
MistPhizzle 2014-08-24 10:49:13 -04:00
parent 1f041b8711
commit 35de391fce
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java
View file

@ -18,11 +18,7 @@ public enum StockAbilities {
AvatarState, AvatarState,
// Project Korra // Project Korra
<<<<<<< HEAD Extraction, Smokescreen, Combustion, LavaSurge, BreathSphere;
Extraction, Smokescreen, Combustion, LavaSurge;
=======
Extraction, Smokescreen, Combustion, BreathSphere;
>>>>>>> origin/master
private enum AirbendingAbilities { private enum AirbendingAbilities {
AirBlast, AirBubble, AirShield, AirSuction, AirSwipe, Tornado, AirScooter, AirSpout, AirBurst, BreathSphere; AirBlast, AirBubble, AirShield, AirSuction, AirSwipe, Tornado, AirScooter, AirSpout, AirBurst, BreathSphere;

1
src/com/projectkorra/ProjectKorra/PKListener.java
View file

@ -138,7 +138,6 @@ public class PKListener implements Listener {
if (event.getDamager() != null) { if (event.getDamager() != null) {
if (LavaWave.isBlockInWave(event.getDamager())) { if (LavaWave.isBlockInWave(event.getDamager())) {
Bukkit.getServer().broadcastMessage("Hit by LavaSurge Lava");
event.setCancelled(true); event.setCancelled(true);
} }
} }

7
src/com/projectkorra/ProjectKorra/firebending/Lightning.java
View file

@ -159,19 +159,16 @@ public class Lightning {
if (en instanceof LivingEntity) { if (en instanceof LivingEntity) {
if (Methods.isWater(en.getLocation().getBlock())) { if (Methods.isWater(en.getLocation().getBlock())) {
Methods.damageEntity(player, entity, (int) damage); Methods.damageEntity(player, entity, (int) damage);
Methods.breakBreathbendingHold(entity);
} }
} }
} }
} else { } else {
if (distance > strikeradius) return; if (distance > strikeradius) return;
Methods.damageEntity(player, entity, (int) damage); Methods.damageEntity(player, entity, (int) damage);
Methods.breakBreathbendingHold(entity);
} }
hitentities.add(entity); hitentities.add(entity);
<<<<<<< HEAD
=======
Methods.damageEntity(player, entity, (int) damage);
Methods.breakBreathbendingHold(entity);
>>>>>>> origin/master
} }
public static boolean isNearbyChannel(Location location) { public static boolean isNearbyChannel(Location location) {