Merge branch 'Sandertv:master' into master

TedacMC · Nov 27, 2024 · c7ff19d · c7ff19d
2 parents 5fbbfa2 + 268adeb
commit c7ff19d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/minecraft/protocol/item_stack.go b/minecraft/protocol/item_stack.go
@@ -564,11 +564,14 @@ func (c *CraftGrindstoneRecipeStackRequestAction) Marshal(r IO) {
 type CraftLoomRecipeStackRequestAction struct {
 	// Pattern is the pattern identifier for the loom recipe.
 	Pattern string
+	// TimesCrafted is how many times the recipe was crafted.
+	TimesCrafted byte
 }
 
 // Marshal ...
 func (c *CraftLoomRecipeStackRequestAction) Marshal(r IO) {
 	r.String(&c.Pattern)
+	r.Uint8(&c.TimesCrafted)
 }
 
 // CraftNonImplementedStackRequestAction is an action sent for inventory actions that aren't yet implemented

diff --git a/minecraft/protocol/packet/player_armour_damage.go b/minecraft/protocol/packet/player_armour_damage.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	PlayerArmourDamageFlagHelmet = 1 << (iota + 1)
+	PlayerArmourDamageFlagHelmet = 1 << iota
 	PlayerArmourDamageFlagChestplate
 	PlayerArmourDamageFlagLeggings
 	PlayerArmourDamageFlagBoots