Merge remote-tracking branch 'origin/master'

This commit is contained in:
themode 2021-03-07 16:09:41 +01:00
commit c20cf38399
1 changed files with 3 additions and 1 deletions

View File

@ -31,12 +31,14 @@ public class EntityProjectile extends Entity {
public EntityProjectile(@Nullable Entity shooter, @NotNull EntityType entityType) {
super(entityType);
this.shooter = shooter;
setup();
}
@Deprecated
public EntityProjectile(@Nullable Entity shooter, @NotNull EntityType entityType, @NotNull Position spawnPosition) {
super(entityType, spawnPosition);
this.shooter = shooter;
setup();
}
private void setup() {
@ -44,7 +46,7 @@ public class EntityProjectile extends Entity {
if (getEntityMeta() instanceof ProjectileMeta) {
((ProjectileMeta) getEntityMeta()).setShooter(this.shooter);
}
setBoundingBox(.5F, .5F, .5F);
setGravity(0.02f, 0.04f, 1.96f);
}
@Nullable