Implemented shields #643
Open
Implemented shields #643
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
T14Raptor
reviewed
Aug 16, 2022
Sandertv
reviewed
Aug 19, 2022
server/entity/arrow.go
Outdated
| @@ -191,6 +191,11 @@ func (a *Arrow) Rotation() (float64, float64) { | |||
| return a.yaw, a.pitch | |||
| } | |||
|
|
|||
| // blocker represents an entity that can block attacks with a shield. | |||
| type blocker interface { | |||
| Blocking() (bool, bool) | |||
There was a problem hiding this comment.
I would document this method and probably add named return types here, because it's unclear what this should return.
server/player/player.go
Outdated
Comment on lines
552
to
587
| if ok, _ := p.Blocking(); ok && source.ReducedByArmour() { | ||
| affected := true | ||
| if src, ok := source.(damage.SourceEntityAttack); ok { | ||
| diff := p.Position().Sub(src.Attacker.Position()) | ||
| diff[1] = 0 | ||
| if diff.Dot(entity.DirectionVector(p)) >= 0.0 { | ||
| affected = false | ||
| } | ||
| } | ||
| if affected { | ||
| w.PlaySound(pos, sound.ShieldBlock{}) | ||
| p.SetBlockingDelay(time.Millisecond * 250) | ||
|
|
||
| if src, ok := source.(damage.SourceEntityAttack); ok { | ||
| if l, ok := src.Attacker.(entity.Living); ok { | ||
| l.KnockBack(pos, 0.5, 0.4) | ||
| } | ||
| if a, ok := src.Attacker.(*Player); ok { | ||
| held, _ := a.HeldItems() | ||
| if _, ok := held.Item().(item.Axe); ok { | ||
| p.SetBlockingDelay(time.Second * 5) | ||
| } | ||
| } | ||
| } | ||
| if dmg >= 3.0 { | ||
| i := int(math.Ceil(totalDamage)) | ||
| held, other := p.HeldItems() | ||
| if _, ok := held.Item().(item.Shield); ok { | ||
| p.SetHeldItems(p.damageItem(held, i), other) | ||
| } else { | ||
| p.SetHeldItems(held, p.damageItem(other, i)) | ||
| } | ||
| } | ||
| return 0, false | ||
| } | ||
| } |
There was a problem hiding this comment.
Could you pull this out in its own method and add some documentation (if and where relevant)? This is a massive block of code and Player.Hurt() is already a pretty big function as it is.
There was a problem hiding this comment.
any method name suggestions?
There was a problem hiding this comment.
this has been resolved, once the conflicts are resolved, are we ready to merge?
Sandertv
reviewed
Aug 19, 2022
89 tasks
# Conflicts: # server/entity/arrow.go # server/player/player.go # server/session/entity_metadata.go
|
Anything about this? |
# Conflicts: # server/entity/arrow.go
) * Update player.go * various changes --------- Co-authored-by: RestartFU <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.