From f11a5e7dc291800f9c41a967b0769eca40756b85 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Tue, 1 Mar 2016 19:28:53 +0100 Subject: [PATCH] MassiveCore - 1.9 pass 1 --- src/com/massivecraft/factions/entity/Faction.java | 1 - src/com/massivecraft/factions/entity/FactionColl.java | 2 -- .../factions/integration/lwc/FactionsLwcModule.java | 5 ++++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/massivecraft/factions/entity/Faction.java b/src/com/massivecraft/factions/entity/Faction.java index 4101bc66..c3275985 100644 --- a/src/com/massivecraft/factions/entity/Faction.java +++ b/src/com/massivecraft/factions/entity/Faction.java @@ -27,7 +27,6 @@ import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.massivecore.Named; -import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveMapDef; import com.massivecraft.massivecore.collections.MassiveTreeSetDef; import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive; diff --git a/src/com/massivecraft/factions/entity/FactionColl.java b/src/com/massivecraft/factions/entity/FactionColl.java index c58f224a..c3d8599c 100644 --- a/src/com/massivecraft/factions/entity/FactionColl.java +++ b/src/com/massivecraft/factions/entity/FactionColl.java @@ -2,14 +2,12 @@ package com.massivecraft.factions.entity; import java.util.*; -import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.store.Coll; import com.massivecraft.massivecore.store.MStore; import com.massivecraft.massivecore.util.Txt; import com.massivecraft.factions.Const; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; -import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.util.MiscUtil; diff --git a/src/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java b/src/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java index 2e2036e9..e4e69f80 100644 --- a/src/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java +++ b/src/com/massivecraft/factions/integration/lwc/FactionsLwcModule.java @@ -14,6 +14,8 @@ import com.massivecraft.factions.Factions; import com.massivecraft.factions.engine.EngineMain; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; +import com.massivecraft.massivecore.SoundEffect; +import com.massivecraft.massivecore.command.type.enumeration.TypeSound; import com.massivecraft.massivecore.mixin.Mixin; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.IdUtil; @@ -93,7 +95,8 @@ public class FactionsLwcModule extends JavaModule // ... play FX ... Location location = block.getLocation(); SmokeUtil.spawnCloudSimple(location); - location.getWorld().playSound(location, Sound.DOOR_OPEN, 1, 1); + + SoundEffect.valueOf("DOOR_OPEN", 1, 1).run(location); // ... and inform. Player player = event.getPlayer();