splash_potion.go: Make throwableOffset() accept and return a cube.Rot…

…ation

server/item/bottle_of_enchanting.go

@@ -11,9 +11,7 @@ type BottleOfEnchanting struct{}
 // Use ...
 func (b BottleOfEnchanting) Use(tx *world.Tx, user User, ctx *UseContext) bool {
 	create := tx.World().EntityRegistry().Config().BottleOfEnchanting
-	r := user.Rotation()
-	r[1] = throwableOffset(r[1])
-	opts := world.EntitySpawnOpts{Position: eyePosition(user), Velocity: r.Vec3().Mul(0.6)}
+	opts := world.EntitySpawnOpts{Position: eyePosition(user), Velocity: throwableOffset(user.Rotation()).Vec3().Mul(0.6)}
 	tx.AddEntity(create(opts, user))
 	tx.PlaySound(user.Position(), sound.ItemThrow{})
 

server/item/lingering_potion.go

@@ -21,9 +21,7 @@ func (l LingeringPotion) MaxCount() int {
 // Use ...
 func (l LingeringPotion) Use(tx *world.Tx, user User, ctx *UseContext) bool {
 	create := tx.World().EntityRegistry().Config().LingeringPotion
-	r := user.Rotation()
-	r[1] = throwableOffset(r[1])
-	opts := world.EntitySpawnOpts{Position: eyePosition(user), Velocity: r.Vec3().Mul(0.5)}
+	opts := world.EntitySpawnOpts{Position: eyePosition(user), Velocity: throwableOffset(user.Rotation()).Vec3().Mul(0.5)}
 	tx.AddEntity(create(opts, l.Type, user))
 	tx.PlaySound(user.Position(), sound.ItemThrow{})
 

server/item/splash_potion.go

@@ -1,6 +1,7 @@
 package item
 
 import (
+	"github.com/df-mc/dragonfly/server/block/cube"
 	"github.com/df-mc/dragonfly/server/item/potion"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/sound"
@@ -21,9 +22,7 @@ func (s SplashPotion) MaxCount() int {
 // Use ...
 func (s SplashPotion) Use(tx *world.Tx, user User, ctx *UseContext) bool {
 	create := tx.World().EntityRegistry().Config().SplashPotion
-	r := user.Rotation()
-	r[1] = throwableOffset(r[1])
-	opts := world.EntitySpawnOpts{Position: eyePosition(user), Velocity: r.Vec3().Mul(0.5)}
+	opts := world.EntitySpawnOpts{Position: eyePosition(user), Velocity: throwableOffset(user.Rotation()).Vec3().Mul(0.5)}
 	tx.AddEntity(create(opts, s.Type, user))
 	tx.PlaySound(user.Position(), sound.ItemThrow{})
 
@@ -36,12 +35,12 @@ func (s SplashPotion) Use(tx *world.Tx, user User, ctx *UseContext) bool {
 // Bottle o' Enchanting are thrown at a higher angle than where the
 // player is looking at.
 // The added offset is an ellipse-like shape based on what the input pitch is.
-func throwableOffset(pitch float64) float64 {
-	pitch = max(min(pitch, 89.9), -89.9)
-	pitch -= math.Sqrt(math.Pow(89.9, 2)-math.Pow(pitch, 2)) * (26.5 / 89.9)
-	pitch = max(min(pitch, 89.9), -89.9)
+func throwableOffset(r cube.Rotation) cube.Rotation {
+	r[1] = max(min(r[1], 89.9), -89.9)
+	r[1] -= math.Sqrt(math.Pow(89.9, 2)-math.Pow(r[1], 2)) * (26.5 / 89.9)
+	r[1] = max(min(r[1], 89.9), -89.9)
 
-	return pitch
+	return r
 }
 
 // EncodeItem ...