Water flow - [merged] - Githubissues

atlarge-research / opencraft

Other

5 stars 2 forks source link

Water flow - [merged] #154

Closed jdonkervliet closed 4 years ago

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 25, 2020, 15:28

Merges bugfix/water-flow -> development

The water flow buggs are fixed

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 11:28

added 1 commit

da3c85aa - Fix lagg with water propagation

Compare with previous version

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 11:28

unmarked as a Work In Progress

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 11:29

changed the description

jdonkervliet commented 4 years ago

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

Commented on src/main/java/net/glowstone/block/blocktype/BlockLiquid.java line 141

Would it be possible to wrap this line at the && instead of halfway through the parameter list?

jdonkervliet commented 4 years ago

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

Commented on src/main/java/net/glowstone/block/blocktype/BlockLiquid.java line 230

Could you use something like SIDES.contains(direction)? Instead of checking each one separately?

jdonkervliet commented 4 years ago

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

Commented on src/main/java/net/glowstone/block/blocktype/BlockLiquid.java line 230

And is the check even necessary when we already count the number of sides in the next for-loop?

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 11:55

Commented on src/main/java/net/glowstone/block/blocktype/BlockLiquid.java line 141

changed this line in version 3 of the diff

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 11:55

Commented on src/main/java/net/glowstone/block/blocktype/BlockLiquid.java line 230

changed this line in version 3 of the diff

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 11:55

added 118 commits

da3c85aa...ecb8146d - 116 commits from branch development
d06bed00 - Remove unnecessary if statement
1b5eaae8 - Merge remote-tracking branch 'origin/development' into bugfix/water-flow

Compare with previous version

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 11:55

Commented on src/main/java/net/glowstone/block/blocktype/BlockLiquid.java line 230

Yes, you are correct. I removed the if statement

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 11:55

resolved all threads

jdonkervliet commented 4 years ago

In GitLab by @larsdetombe on May 28, 2020, 12:17

Commented on src/main/java/net/glowstone/block/blocktype/BlockLiquid.java line 229

Could you add some whitelines before and in this if statement?

jdonkervliet commented 4 years ago

In GitLab by @wubero on May 28, 2020, 12:20

added 1 commit

2addaeb0 - Fix whitelines

Compare with previous version

jdonkervliet commented 4 years ago

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

Commented on src/main/java/net/glowstone/block/blocktype/BlockLiquid.java line 229

Should be fixed now

jdonkervliet commented 4 years ago

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

resolved all threads

jdonkervliet commented 4 years ago

In GitLab by @larsdetombe on May 28, 2020, 12:22

enabled an automatic merge when the pipeline for 2addaeb00939e7c67163c9bef2e78042cc6c7940 succeeds

jdonkervliet commented 4 years ago

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

canceled the automatic merge

jdonkervliet commented 4 years ago

In GitLab by @swabbur on May 28, 2020, 13:04

enabled an automatic merge when the pipeline for 2addaeb00939e7c67163c9bef2e78042cc6c7940 succeeds

jdonkervliet commented 4 years ago

In GitLab by @swabbur on May 28, 2020, 13:27

merged

jdonkervliet commented 4 years ago

In GitLab by @swabbur on May 28, 2020, 13:27

mentioned in commit 3cb059489b21abbc8435c1705ac65cd9ad74702e