TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #483 from jedk1/master

Browse source 
Fix NPE in blocksource & Avy Cooldown
This commit is contained in:
OmniCypher 2016-04-18 17:16:34 -07:00
commit a59c651386
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/avatar/AvatarState.java
View file

@ -69,7 +69,7 @@ public class AvatarState extends AvatarAbility {
public void run() { public void run() {
GLOBAL_COOLDOWNS.remove(id); GLOBAL_COOLDOWNS.remove(id);
} }
}, cooldown); }, cooldown/50);
} }
} }

9
src/com/projectkorra/projectkorra/util/BlockSource.java
View file

@ -156,10 +156,13 @@ public class BlockSource {
*/ */
public static Block getSourceBlock(Player player, double range, BlockSourceType sourceType, ClickType clickType) { public static Block getSourceBlock(Player player, double range, BlockSourceType sourceType, ClickType clickType) {
BlockSourceInformation info = getValidBlockSourceInformation(player, range, sourceType, clickType); BlockSourceInformation info = getValidBlockSourceInformation(player, range, sourceType, clickType);
if (TempBlock.isTempBlock(info.getBlock())) { if (info != null) {
return null; if (TempBlock.isTempBlock(info.getBlock())) {
return null;
}
return info.getBlock();
} }
return info != null ? info.getBlock() : null; return null;
} }
/** /**