Skip to content

Commit

Permalink
Fixes #9
Browse files Browse the repository at this point in the history
Fixes #10
Updated README with more complete regulations
Updated build.gradle and mcmod.info to properly reflect new version
Added new release jar
  • Loading branch information
Spartan322 committed Nov 2, 2015
1 parent da51dfb commit 64efd4b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ The Minecraft Mod that adds the (movie) HTTYD universe to Minecraft (and more)
#### Important
This is the 1.7.10 branch

### Mod Users
####Before you post an issue:
Search the **[issue tracker]** for it first

**Search [here][1] _before_** reporting issues to the [issue tracker][1]
####If you have a log:
Use [gist](https://gist.github.com) or [pastebin](http://pastebin.com/)

### Contributers

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ idea {

apply plugin: 'forge'

version = "1.7.10-10.13.2.1230F-1.0R"
version = "1.7.10-10.13.2.1230F-1.0.1R"
group= "com.httymd" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "HTTYMD"

Expand Down
2 changes: 1 addition & 1 deletion java/com/httymd/client/event/PlayerClientHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void beforeBodyRender(RenderLivingEvent.Pre event) {
ItemStack stack = Utils.getArmor(event.entity, 2);
if (stack == null)
return;
ItemGlideArmor armor = (ItemGlideArmor) stack.getItem();
ItemGlideArmor armor = stack.getItem() instanceof ItemGlideArmor ? (ItemGlideArmor) stack.getItem() : null;
if (armor != null) {
if (armor.isGliding(stack)) {
glideRender.doRender(event.entity, event.x, event.y + event.entity.yOffset, event.z, 0.0F, playerTicks);
Expand Down
7 changes: 4 additions & 3 deletions java/com/httymd/util/DragonDamageSource.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.httymd.util;

import org.apache.commons.lang3.RandomUtils;

import net.minecraft.entity.Entity;
import net.minecraft.util.EntityDamageSource;
import net.minecraft.util.EntityDamageSourceIndirect;
import scala.util.Random;

public class DragonDamageSource {

private static final Random rng = new Random();

public static EntityDamageSource getAbilityDamage(Entity attacker, Entity source, String add) {
return attacker == null ? new EntityDamageSource(Utils.getModString("dragon.ability") + add, source)
: new EntityDamageSourceIndirect(Utils.getModString("dragon.ability") + add, source, attacker);
Expand All @@ -34,7 +35,7 @@ public static EntityDamageSource getProjectileFireDamage(Entity attacker, Entity
}

public static EntityDamageSource getDirectDamage(Entity attacker) {
return new EntityDamageSource(Utils.getModString("dragon.direct." + RandomUtils.nextInt(1, 3)), attacker);
return new EntityDamageSource(Utils.getModString("dragon.direct." + rng.nextInt(2)+1), attacker);
}

}
Binary file added releases/HTTYMD-1.7.10-10.13.2.1230F-1.0.1R.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"modid": "httymd",
"name": "How to Train Your Minecraft Dragon",
"description": "The Mod based on How to Train your Dragon (movie) which adds everything from the franchise. From small daggers to Boss Dragons and everything in betweens. Try out Hiccups Glide Suit or the Crossbow, or you could fly your very own, loyal dragon named what you want them to.",
"version": "1.0.0",
"version": "1.0.1",
"mcversion": "${mcversion}",
"url": "",
"updateUrl": "",
Expand Down

0 comments on commit 64efd4b

Please sign in to comment.