EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

I *think* this should be backwards compatible, I may be wrong and it could break both.

Browse Source
This commit is contained in:
t00thpick1
2016-03-01 13:08:11 -05:00
parent 8d16af8770
commit 88b99a3835
16 changed files with 129 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -31,6 +31,7 @@ import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.StringUtils;
import com.gmail.nossr50.util.adapter.SoundAdapter;
import com.gmail.nossr50.util.player.UserManager;
import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.gmail.nossr50.util.skills.SkillUtils;
@ -333,7 +334,7 @@ public class TamingManager extends SkillManager {
}
player.sendMessage(LocaleLoader.getString("Taming.Summon.Complete") + lifeSpan);
player.playSound(location, Sound.ENTITY_FIREWORK_BLAST_FAR, 1F, 0.5F);
player.playSound(location, SoundAdapter.FIREWORK_BLAST_FAR, 1F, 0.5F);
}
private boolean rangeCheck(EntityType type) {

3
src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java
View File

@ -11,6 +11,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.adapter.SoundAdapter;
import com.gmail.nossr50.util.skills.CombatUtils;
import com.gmail.nossr50.util.skills.ParticleEffectUtils;
@ -35,7 +36,7 @@ public class TrackedTamingEntity extends BukkitRunnable {
public void run() {
if (livingEntity.isValid()) {
Location location = livingEntity.getLocation();
location.getWorld().playSound(location, Sound.BLOCK_FIRE_EXTINGUISH, 0.8F, 0.8F);
location.getWorld().playSound(location, SoundAdapter.FIZZ, 0.8F, 0.8F);
ParticleEffectUtils.playCallOfTheWildEffect(livingEntity);
CombatUtils.dealDamage(livingEntity, livingEntity.getMaxHealth(), DamageCause.SUICIDE, livingEntity);
}