Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implemented TNT #604

Merged
merged 58 commits into from
Jul 31, 2022
Merged

Implemented TNT #604

merged 58 commits into from
Jul 31, 2022

Conversation

JustTalDevelops
Copy link
Member

No description provided.

T14Raptor and others added 30 commits July 12, 2022 11:05
@T14Raptor
explosion/explosion.go: Third attempt at implementing explosions.
3346de4
@T14Raptor
Merge remote-tracking branch 'origin/master' into feature/explosions
800702d
@T14Raptor
"Explodable" api
b172c4d
@T14Raptor
Moved explosions to block package
11882b2
@JustTalDevelops
Merge branch 'master' into feature/explosions
61f945c
@JustTalDevelops
Merge remote-tracking branch 'origin/master' into feature/explosions
4a3db7d
@T14Raptor
improvements
c8c1965
@JustTalDevelops
block: Added blast resistances for each block.
fd081cf
@JustTalDevelops
Merge remote-tracking branch 'origin/feature/explosions' into feature…
4da01aa 
…/explosions

# Conflicts:
#	server/block/block.go
#	server/block/explosion.go
@JustTalDevelops
block/break_info.go: Improve doc.
f0886fb
@JustTalDevelops @T14Raptor
Update server/block/explosion.go
a134491 
Co-authored-by: Raptor <t14raptor@gmail.com>
@JustTalDevelops
block/explosion.go: Use box for consistency.
489570f
@JustTalDevelops
Merge remote-tracking branch 'origin/feature/explosions' into feature…
b982885 
…/explosions
@T14Raptor
block/break_info.go: Don't multiply hardness by 5.
97b9cf6
@T14Raptor
Merge remote-tracking branch 'origin/feature/explosions' into feature…
83e7e71 
…/explosions
@T14Raptor
block/break_info.go: Correct doc.
294f673
@JustTalDevelops
block/explosion.go: Fix SpawnFire logic.
020bf23
@JustTalDevelops
damage/source.go: Doc SourceExplosion.
c026aa5
@T14Raptor
player/player.go: Implement ExplodableEntity.
011b7f4
@T14Raptor
Merge remote-tracking branch 'origin/feature/explosions' into feature…
9cd90fe 
…/explosions
@JustTalDevelops
player/player.go: Directly set velocity.
7a9f47a
@JustTalDevelops
player/player.go: Revert "Directly set velocity".
d6fabcc
@T14Raptor
block/explosion.go: Change Radius field back to Size.
659a0ca
@T14Raptor
Merge remote-tracking branch 'origin/feature/explosions' into feature…
1c01f45 
…/explosions
@T14Raptor
Fixes
e5e5fa9
@T14Raptor
block/explosions.go: Fixed exposure?
cc79531
@T14Raptor
Merge remote-tracking branch 'origin/master' into feature/explosions
cb9b588 
# Conflicts:
#	server/block/block.go
#	server/block/stone_bricks.go
@JustTalDevelops
Merge branch 'master' into feature/explosions
3a4180a
@JustTalDevelops
block/block.go: Blame GitHub!
c4f7ec8
@T14Raptor
block/explosion.go: Divide blast resistance by 5.
cb209b1
@JustTalDevelops
Copy link
Member Author

This PR looks great, but on a closer look of behavior in vanilla, seems that lighting TNT with Fire Aspect items has not yet been implemented.

Implemented this.

@JustTalDevelops JustTalDevelops removed the awaiting response More information is required to resolve and/or close the issue label Jul 27, 2022
Base automatically changed from feature/explosions to master July 29, 2022 20:22
@DaPigGuy
Merge branch 'master' into feature/tnt
b258517 
# Conflicts:
#	server/block/explosion.go
#	server/block/hash.go
#	server/entity/register.go
#	server/session/world.go
Sandertv
Sandertv requested changes Jul 31, 2022
View reviewed changes
Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got 2 pretty minor comments. Looks good otherwise!

server/block/tnt.go Outdated Show resolved Hide resolved
server/entity/tnt.go Outdated Show resolved Hide resolved
@DaPigGuy DaPigGuy requested a review from Sandertv July 31, 2022 11:19
Sandertv
Sandertv approved these changes Jul 31, 2022
View reviewed changes
Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks for the PR!

@Sandertv Sandertv merged commit f627c94 into master Jul 31, 2022
@Sandertv Sandertv deleted the feature/tnt branch July 31, 2022 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DaPigGuy DaPigGuy DaPigGuy approved these changes

@Sandertv Sandertv Sandertv approved these changes

@T14Raptor T14Raptor Awaiting requested review from T14Raptor

Assignees
No one assigned
Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@JustTalDevelops @DaPigGuy @abimek @DretooFuni @Sandertv @T14Raptor