Projects >> Terasology >>cf630ee40f495857d9e0c0c48abf8c2777f42ec4

Chunk
Conflicting content 
import org.terasology.assets.management.AssetManager;
import org.terasology.audio.AudioEndListener;
import org.terasology.audio.StaticSound;
<<<<<<< HEAD
import org.terasology.audio.events.PlaySoundEvent;
=======
import org.terasology.logic.location.LocationComponent;
import org.terasology.math.geom.Vector3f;
>>>>>>> aaa248252ac58fb15d7485ff9d36f66e3336624f
import org.terasology.registry.In;
import org.terasology.rendering.nui.properties.OneOf;
import org.terasology.rendering.nui.properties.Range;
Solution content 
import org.terasology.assets.management.AssetManager;
import org.terasology.audio.AudioEndListener;
import org.terasology.audio.StaticSound;
import org.terasology.audio.events.PlaySoundEvent;
import org.terasology.registry.In;
import org.terasology.rendering.nui.properties.OneOf;
import org.terasology.rendering.nui.properties.Range;
File
PlaySoundNode.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            if (uri != null) {
                Optional snd = assetManager.getAsset(uri, StaticSound.class);
                if (snd.isPresent()) {
<<<<<<< HEAD
                    actor().minion().send(new PlaySoundEvent(snd.get(), getNode().volume));
=======
                    if (actor().hasComponent(LocationComponent.class)) {
                        Vector3f worldPosition = actor().getComponent(LocationComponent.class).getWorldPosition();
                        audioManager.playSound(snd.get(), worldPosition, getNode().volume, AudioManager.PRIORITY_NORMAL, this);
                    } else {
                        audioManager.playSound(snd.get(), new Vector3f(), getNode().volume, AudioManager.PRIORITY_NORMAL, this);
                    }
>>>>>>> aaa248252ac58fb15d7485ff9d36f66e3336624f
                    playing = true;
                }
            }
Solution content 
            if (uri != null) {
                Optional snd = assetManager.getAsset(uri, StaticSound.class);
                if (snd.isPresent()) {
                    actor().getEntity().send(new PlaySoundEvent(snd.get(), getNode().volume));
                    playing = true;
                }
            }
File
PlaySoundNode.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation