Merge branch '1.12.2' into 1.12.2-dev

2019-01-06 16:26:02 +00:00
parent 31673cf247 f907d50333
commit 3bdee06738
29 changed files with 1078 additions and 55 deletions
@@ -395,7 +395,7 @@ public abstract class EntityMagicArrow extends Entity implements IProjectile, IE
 					this.onBlockHit(raytraceresult);

 					if(this.stuckInBlock.getMaterial() != Material.AIR){
-						this.stuckInBlock.getBlock().onEntityCollidedWithBlock(this.world, raytraceresult.getBlockPos(),
+						this.stuckInBlock.getBlock().onEntityCollision(this.world, raytraceresult.getBlockPos(),
 								this.stuckInBlock, this);
 					}
 				}