Fix NotifyNeighborBlockEvent root cause. Fixes #1174

SpongePowered · Feb 4, 2017 · bf0cc9f · bf0cc9f
1 parent ed6df70
commit bf0cc9f
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/main/java/org/spongepowered/common/event/SpongeCommonEventFactory.java b/src/main/java/org/spongepowered/common/event/SpongeCommonEventFactory.java
@@ -336,16 +336,15 @@ public static NotifyNeighborBlockEvent callNotifyNeighborEvent(World world, Bloc
             rootCause = phaseContext.first(Object.class).orElse(null);
         }
 
+        final BlockState blockstate = (BlockState)((net.minecraft.world.World) world).getBlockState(sourcePos);
+        final LocatableBlock locatable = LocatableBlock.builder()
+                .location(new Location<World>((World) world, sourcePos.getX(), sourcePos.getY(), sourcePos.getZ()))
+                .state(blockstate)
+                .build();
+        builder = Cause.source(locatable);
         if (rootCause instanceof User) {
-            final BlockState blockstate = (BlockState)((net.minecraft.world.World) world).getBlockState(sourcePos);
-            final LocatableBlock locatable = LocatableBlock.builder()
-                    .location(new Location<World>((World) world, sourcePos.getX(), sourcePos.getY(), sourcePos.getZ()))
-                    .state(blockstate)
-                    .build();
-            builder = Cause.source(locatable);
             builder.named(NamedCause.notifier(rootCause));
         } else {
-            builder = Cause.source(rootCause);
             if (user != null) {
                 builder.named(NamedCause.notifier(user));
             } else {