Skip to content

Commit

Permalink
Update other effects to depend on Health module events
Browse files Browse the repository at this point in the history
  • Loading branch information
e-aakash committed Jun 22, 2019
1 parent 100701d commit 318774a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,9 @@
*/
package org.terasology.potions.effect;

import org.terasology.entitySystem.entity.EntityManager;
import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.event.ReceiveEvent;
import org.terasology.logic.actions.ActionTarget;
import org.terasology.logic.actions.ExplosionActionComponent;
import org.terasology.logic.health.DoDamageEvent;
import org.terasology.potions.HerbEffect;
import org.terasology.potions.events.DrinkPotionEvent;
import org.terasology.world.block.Block;

/**
* This effect destroys blocks in a predefined block radius (the built-in one for now)
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/org/terasology/potions/effect/HarmEffect.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
*/
package org.terasology.potions.effect;

import org.terasology.logic.health.DoDamageEvent;
import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.logic.health.event.DoDamageEvent;
import org.terasology.math.TeraMath;
import org.terasology.potions.HerbEffect;
import org.terasology.entitySystem.entity.*;
import org.terasology.math.*;
public class HarmEffect implements HerbEffect{

public class HarmEffect implements HerbEffect {
/**
* The base amount of harming allowed. It's intended to be later multiplied by the magnitude to get the final
* harming amount.
Expand Down

0 comments on commit 318774a

Please sign in to comment.