Permalink
Browse files

Edited src/wimerrill/Offering/RewardAction.java via GitHub

  • Loading branch information...
1 parent f82e808 commit d6a79643bd28fdef982692845810cf0fa9df5d7b @viking-sudo-rm committed Sep 7, 2011
Showing with 0 additions and 3 deletions.
  1. +0 −3 src/wimerrill/Offering/RewardAction.java
View
3 src/wimerrill/Offering/RewardAction.java
@@ -28,7 +28,6 @@ public void process(String name, Player player, Parameter p, Block block) {
parameter.add(p1);
}
}
-<<<<<<< HEAD
if (name.equals("tp")) { doTp(player,parameter); }
if (name.equals("lightning")) { doLightning(player,parameter); }
if (name.equals("heal")) { doHeal(player,parameter); }
@@ -37,14 +36,12 @@ public void process(String name, Player player, Parameter p, Block block) {
if (name.equals("give")) { doGive(player,parameter); }
if (name.equals("worldtp")) { doWorldTp(player,parameter); }
if (name.equals("spawnmob")) { doSpawnMob(player,parameter,block); }
-=======
if (name.equalsIgnoreCase("tp")) doTp(player,parameter);
if (name.equalsIgnoreCase("lightning")) doLightning(player,parameter);
if (name.equalsIgnoreCase("heal")) doHeal(player,parameter);
if (name.equalsIgnoreCase("time")) doTime(player,parameter);
if (name.equalsIgnoreCase("weather")) doWeather(player,parameter);
if (name.equalsIgnoreCase("give")) doGive(player,parameter);
->>>>>>> 2f35646b4ea41f35136387573d0d2df34f481bc5
/*
* TODO: add error catching
* TODO: add custom decays/no decays

0 comments on commit d6a7964

Please sign in to comment.