Merge remote-tracking branch 'origin/mc-1.10.2' into mc-1.11.2

# Conflicts:
#	src/main/java/mods/timberjack/common/entity/EntityTimber.java
#	src/main/java/mods/timberjack/common/felling/TimberjackEventHandler.java

Author: CovertJaguar

src/main/java/mods/timberjack/common/entity/EntityTimber.java

@@ -52,7 +52,7 @@ public class EntityTimber extends Entity implements IEntityAdditionalSpawnData {
     private float fallHurtAmount = 2.0F;
     private NBTTagCompound tileEntityData;
     private List<ItemStack> drops = new ArrayList<>();
-    private EnumFacing fellingDirection;
+    private EnumFacing fellingDirection = EnumFacing.UP;
 
     public EntityTimber(World worldIn) {
         super(worldIn);
@@ -124,7 +124,7 @@ public void onUpdate() {
 
                 IBlockState state = this.world.getBlockState(currentPos);
                 if (state.getBlock() == block) {
-                    if (!log) {
+                    if (!this.world.isRemote && !log) {
                         drops.addAll(block.getDrops(world, currentPos, state, 0));
                     }
                     this.world.setBlockToAir(currentPos);
@@ -261,7 +261,7 @@ private boolean doTileDrops() {
         return world.getGameRules().getBoolean("doEntityDrops");
     }
 
-    public void rotateLog(IBlockState state, BlockPos pos) {
+    private void rotateLog(IBlockState state, BlockPos pos) {
         if (state.getBlock() instanceof BlockLog && state.getProperties().containsKey(BlockLog.LOG_AXIS)) {
             BlockLog.EnumAxis axis;
             switch (fellingDirection.getAxis()) {
@@ -274,8 +274,10 @@ public void rotateLog(IBlockState state, BlockPos pos) {
                 default:
                     axis = BlockLog.EnumAxis.Y;
             }
-            IBlockState newState = state.withProperty(BlockLog.LOG_AXIS, axis);
-            world.setBlockState(pos, newState);
+            if (axis != BlockLog.EnumAxis.Y) {
+                IBlockState newState = state.withProperty(BlockLog.LOG_AXIS, axis);
+                world.setBlockState(pos, newState);
+            }
         }
     }
 
@@ -292,7 +294,7 @@ protected void writeEntityToNBT(NBTTagCompound compound) {
         compound.setBoolean("HurtEntities", this.hurtEntities);
         compound.setFloat("FallHurtAmount", this.fallHurtAmount);
         compound.setInteger("FallHurtMax", this.fallHurtMax);
-        compound.setInteger("FallingDirection", this.fellingDirection.ordinal());
+        compound.setInteger("FellingDirection", this.fellingDirection.ordinal());
 
         if (this.tileEntityData != null) {
             compound.setTag("TileEntityData", this.tileEntityData);
@@ -330,7 +332,7 @@ protected void readEntityFromNBT(NBTTagCompound compound) {
             this.tileEntityData = compound.getCompoundTag("TileEntityData");
         }
 
-        this.fellingDirection = EnumFacing.VALUES[compound.getInteger("FallingDirection")];
+        this.fellingDirection = EnumFacing.VALUES[compound.getInteger("FellingDirection")];
 
         if (block == null || block.getDefaultState().getMaterial() == Material.AIR) {
             this.fallingBlock = Blocks.LOG.getDefaultState();
@@ -371,10 +373,14 @@ public boolean ignoreItemEntityData() {
     @Override
     public void writeSpawnData(ByteBuf buffer) {
         buffer.writeInt(Block.getStateId(fallingBlock));
+        buffer.writeBoolean(log);
+        buffer.writeByte(fellingDirection.ordinal());
     }
 
     @Override
     public void readSpawnData(ByteBuf additionalData) {
-        fallingBlock = Block.getStateById(additionalData.getInt(additionalData.readerIndex()) & 65535);
+        fallingBlock = Block.getStateById(additionalData.readInt() & 65535);
+        log = additionalData.readBoolean();
+        fellingDirection = EnumFacing.VALUES[additionalData.readByte()];
     }
 }

src/main/java/mods/timberjack/common/felling/TimberjackEventHandler.java

@@ -71,11 +71,17 @@ public void chopEvent(BlockEvent.BreakEvent event) {
         if ((!event.getPlayer().isSneaking() || !TimberjackConfig.sneakingPreventsFelling()) && TimberjackUtils.isWood(event.getState(), world, event.getPos())) {
             EnumFacing fellingDirection;
             if (world.rand.nextFloat() < 0.1) {
-                fellingDirection = EnumFacing.HORIZONTALS[new Random().nextInt(EnumFacing.HORIZONTALS.length)];
+                fellingDirection = getRandomHorizontalFacing();
             } else {
                 fellingDirection = EnumFacing.getDirectionFromEntityLiving(event.getPos(), event.getPlayer()).getOpposite();
+                if (fellingDirection.getAxis() == EnumFacing.Axis.Y)
+                    fellingDirection = getRandomHorizontalFacing();
             }
             FellingManager.fellingManagers.computeIfAbsent(world, FellingManager::new).onChop(event.getPos(), fellingDirection);
         }
     }
+
+    private EnumFacing getRandomHorizontalFacing() {
+        return EnumFacing.HORIZONTALS[new Random().nextInt(EnumFacing.HORIZONTALS.length)];
+    }
 }

src/main/java/mods/timberjack/common/felling/TimberjackUtils.java

@@ -113,7 +113,8 @@ private static void spawnFalling(World world, BlockPos pos, Vec3d centroid, IBlo
         Vec3d vector = new Vec3d(pos.getX(), 0, pos.getZ());
         vector = vector.subtract(centroid.xCoord, 0, centroid.zCoord);
         vector = vector.normalize().scale(0.5);
-        vector = vector.add(new Vec3d(fellingDirection.getDirectionVec()));
+        if (fellingDirection.getAxis() != EnumFacing.Axis.Y)
+            vector = vector.add(new Vec3d(fellingDirection.getDirectionVec()));
         vector = vector.normalize();
         entity.motionX = vector.xCoord * 0.3 + (world.rand.nextFloat() - 0.5) * 0.15;
         entity.motionZ = vector.zCoord * 0.3 + (world.rand.nextFloat() - 0.5) * 0.15;