TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-10-05 16:32:53 +00:00
Code Issues Projects Releases Wiki Activity

Fixed AirShield and NPE (#660)

Browse source 
• Fixed AirShield not blocking FireBlast, EarthBlast and WaterManip
• Fixed an NPE in RPG
This commit is contained in:
StrangeOne101 2016-12-12 08:43:39 +13:00 committed by Christopher Martin
parent 9f863cc0e9
commit 24ca9182c0
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/ability/ElementalAbility.java
View file

@ -115,7 +115,7 @@ public abstract class ElementalAbility extends CoreAbility {
}
public static boolean isSolarEclipse(World world) {
if (world == null || !GeneralMethods.hasRPG()) {
if (world == null || !GeneralMethods.hasRPG() || !EventManager.marker.containsKey(world)) {
return false;
}
return EventManager.marker.get(world).equalsIgnoreCase("SolarEclipse");

3
src/com/projectkorra/projectkorra/ability/util/CollisionInitializer.java
View file

@ -152,6 +152,9 @@ public class CollisionInitializer {
collisionManager.addCollision(new Collision(airShield, airBlast, false, true));
collisionManager.addCollision(new Collision(airShield, airSuction, false, true));
collisionManager.addCollision(new Collision(airShield, airStream, false, true));
collisionManager.addCollision(new Collision(airShield, fireBlast, false, true));
collisionManager.addCollision(new Collision(airShield, earthBlast, false, true));
collisionManager.addCollision(new Collision(airShield, waterManipulation, false, true));
for (CoreAbility comboAbil : comboAbils) {
collisionManager.addCollision(new Collision(airShield, comboAbil, false, true));
}