Fix TNT behaviour - [merged] #162

Closed jdonkervliet closed 4 years ago

In GitLab by @julian9499 on May 28, 2020, 10:22

Merges feature/fix-tnt-particles -> development

Explosions now do a distance check before applying entity damage and also don't cause any block damage when in water. Furthermore are TNT particles themself also fixed to look more like the original Minecraft game.

In GitLab by @swabbur on May 28, 2020, 10:23

Commented on src/main/java/net/glowstone/Explosion.java line 51

Could this be made an integer as well? (The other radii are)

In GitLab by @julian9499 on May 28, 2020, 10:24

added 1 commit

350ed33b - fix checkstyle errors

Compare with previous version

In GitLab by @julian9499 on May 28, 2020, 10:26

Commented on src/main/java/net/glowstone/Explosion.java line 51

changed this line in version 3 of the diff

In GitLab by @julian9499 on May 28, 2020, 10:26

added 1 commit

646d240b - make int instead of double

Compare with previous version

In GitLab by @julian9499 on May 28, 2020, 10:26

Commented on src/main/java/net/glowstone/Explosion.java line 51

done

In GitLab by @julian9499 on May 28, 2020, 10:26

resolved all threads

In GitLab by @swabbur on May 28, 2020, 10:31

Commented on src/main/java/net/glowstone/entity/GlowPlayer.java line 1298

Can this be removed completely?

In GitLab by @swabbur on May 28, 2020, 10:33

Commented on src/main/java/net/glowstone/entity/GlowTntPrimed.java line 72

Can this comment be removed?

In GitLab by @julian9499 on May 28, 2020, 10:33

Commented on src/main/java/net/glowstone/entity/GlowPlayer.java line 1298

Yeah this logic doubles the player's velocity for no apparent reason

In GitLab by @julian9499 on May 28, 2020, 10:34

Commented on src/main/java/net/glowstone/entity/GlowTntPrimed.java line 72

Done!

In GitLab by @swabbur on May 28, 2020, 10:36

resolved all threads

In GitLab by @swabbur on May 28, 2020, 10:38

Commented on src/main/java/net/glowstone/entity/GlowPlayer.java line 1298

Can we remove the override as a whole? Or does the code above have be rewritten at some point?

In GitLab by @swabbur on May 28, 2020, 10:39

Commented on src/main/java/net/glowstone/entity/GlowTntPrimed.java line 28

Is rand used anywhere else than the constructor? If so, could you make it private? If not, could you make it local?

In GitLab by @swabbur on May 28, 2020, 10:45

Commented on src/main/java/net/glowstone/util/Vectors.java line 64

Could you remove the whitelines in this method? Or, add one above double length. The one inbetween double length and the if-statements could be removed.

In GitLab by @swabbur on May 28, 2020, 10:46

Commented on src/test/java/net/glowstone/util/VectorsTest.java line 74

Missing whitelines at the start of each test method.

In GitLab by @wubero on May 28, 2020, 10:54

Commented on src/main/java/net/glowstone/Explosion.java line 161

This if statement can be replaced by the isLiquid method

In GitLab by @julian9499 on May 28, 2020, 10:57

Commented on src/main/java/net/glowstone/entity/GlowPlayer.java line 1298

I think it has to be rewritten at some point to support proper velocity checking voor players

In GitLab by @julian9499 on May 28, 2020, 10:57

Commented on src/main/java/net/glowstone/util/Vectors.java line 64

Will do!

In GitLab by @julian9499 on May 28, 2020, 10:58

Commented on src/main/java/net/glowstone/Explosion.java line 161

Ah great. I didn't know it was implemented already

In GitLab by @larsdetombe on May 28, 2020, 11:02

Commented on src/main/java/net/glowstone/Explosion.java line 303

Maybe add a TODO, so we know this still has to be fixed.

In GitLab by @swabbur on May 28, 2020, 11:10

Commented on src/main/java/net/glowstone/entity/GlowPlayer.java line 1298

Okay!

In GitLab by @JimVliet on May 28, 2020, 11:12

Can you update your branch with development, it is very far behind.

In GitLab by @julian9499 on May 28, 2020, 11:45

added 177 commits

646d240b...ecb8146d - 174 commits from branch development
960c6671 - Merge branch 'development' into feature/fix-tnt-particles
13f6a44c - Merge branch 'feature/fix-tnt-particles' of...
1a298a73 - Merge branch 'development' into feature/fix-tnt-particles

Compare with previous version

In GitLab by @julian9499 on May 28, 2020, 11:50

Commented on src/main/java/net/glowstone/entity/GlowTntPrimed.java line 28

It is privated and used among the codebase

In GitLab by @julian9499 on May 28, 2020, 11:50

Commented on src/main/java/net/glowstone/Explosion.java line 161

changed this line in version 5 of the diff

In GitLab by @julian9499 on May 28, 2020, 11:50

added 1 commit

e2ace79f - remove unnecessary double rand initialization in glowtntprimed

Compare with previous version

In GitLab by @julian9499 on May 28, 2020, 11:53

added 1 commit

808f782c - add todo and whitelines

Compare with previous version

In GitLab by @julian9499 on May 28, 2020, 11:53

resolved all threads

In GitLab by @swabbur on May 28, 2020, 12:21

Commented on src/main/java/net/glowstone/Explosion.java line 400

You are missing a space after the comma, and I would prefer it if this line were split into two separate lines (the same holds for the else-statement).

Location center = location.clone().toCenterLocation();
world.spawnParticle(Particle.EXPLOSION_HUGE, center, 1);

In GitLab by @swabbur on May 28, 2020, 12:23

Commented on src/main/java/net/glowstone/entity/GlowTntPrimed.java line 28

Can it be made final though?

In GitLab by @swabbur on May 28, 2020, 12:24

Commented on src/main/java/net/glowstone/entity/GlowTntPrimed.java line 28

Also, is it guaranteed that the use cases of the rand variable occur within the same thread? If not, it should always be reacquired (since it is a different value for each thread).

In GitLab by @swabbur on May 28, 2020, 12:24

Commented on src/test/java/net/glowstone/util/VectorsTest.java line 74

Could you do it for the existing methods in this class as well, please?

In GitLab by @julian9499 on May 28, 2020, 12:36

Commented on src/main/java/net/glowstone/entity/GlowTntPrimed.java line 28

changed this line in version 7 of the diff

In GitLab by @julian9499 on May 28, 2020, 12:36

added 2 commits

bc1f8f90 - add final
b3d2e8ea - fix whitelines and remove redudant player code

Compare with previous version

In GitLab by @JimVliet on May 28, 2020, 12:39

Commented on src/main/java/net/glowstone/entity/passive/GlowDonkey.java line 12

Maybe revert the health change for the donkey :O

In GitLab by @julian9499 on May 28, 2020, 12:39

Commented on src/main/java/net/glowstone/Explosion.java line 400

changed this line in version 8 of the diff

In GitLab by @julian9499 on May 28, 2020, 12:39

Commented on src/main/java/net/glowstone/entity/passive/GlowDonkey.java line 12

changed this line in version 8 of the diff

In GitLab by @julian9499 on May 28, 2020, 12:39

added 2 commits

bc8042fc - generalize location variable
e00053ea - revert donkey health

Compare with previous version

In GitLab by @julian9499 on May 28, 2020, 12:39

resolved all threads

In GitLab by @julian9499 on May 28, 2020, 12:46

added 1 commit

62c0f5ce - remove unused import

Compare with previous version

In GitLab by @julian9499 on May 28, 2020, 12:51

enabled an automatic merge when the pipeline for 62c0f5ced64cc15adf0775d64367aefb08ef7be3 succeeds

In GitLab by @julian9499 on May 28, 2020, 12:51

canceled the automatic merge

In GitLab by @larsdetombe on May 28, 2020, 13:06

It seems that when TNT explodes in my world, the actual blocks that are exploded, don't drop items and are only visibly removed. When I try to place a block in an area exploded by the TNT, the original block is placed back as if the actual block was only visibly removed but not physically.

In GitLab by @julian9499 on May 28, 2020, 13:07

Commented on src/main/java/net/glowstone/Explosion.java line 303

changed this line in version 10 of the diff

In GitLab by @julian9499 on May 28, 2020, 13:07

added 1 commit