Smooth Pistons #1542

davchoo · 2020-11-15T01:30:32Z

Fixes the flickering with pistons moving blocks. Needs GeyserMC/mappings#41
Fixes #2241

Fix moving pistons

Camotoy

There's a lot to go through here - I'll try to run it later and get an IDE analysis of it.

...in/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java

Camotoy · 2020-11-15T20:55:19Z

https://cdn.discordapp.com/attachments/613194762249437245/777637784063180840/pistons-2020-11-15_15.53.02.mp4 there appears to be some buggy behavior.

davchoo · 2020-11-15T21:07:32Z

Ah, totally forgot about normal pistons.

Camotoy · 2020-11-15T21:14:17Z

Solved on my end.

# Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java # connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java # connector/src/main/resources/mappings

...in/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java

Camotoy · 2020-11-24T17:10:04Z

Looks good so far! I love that the slime block works correctly. A couple of critiques:

I tested a [sticky] piston with no block attached and the current master behavior still applies where a player moves to the ground.
Have you tried applying motion to the player in all cases instead of teleporting them? It might seem a little cleaner, and as of 1.16.20 I believe that is BDS behavior.

zimzaza4 · 2020-11-25T10:45:08Z

It's great. It solved #1437

davchoo · 2020-11-26T06:13:47Z

I've fixed movement with pistons without any blocks attached.

I didn't see any SetEntityMotion packets while using ProxyPass and BDS, but I tried it anyway. It kinda works but tends to push players sideways. You can see the effect when being launched by a slime block.
I'm having trouble with the Java server teleporting players back to their original positions, which I believe causes honey and slime blocks to work intermittently.

Hopefully fixes issues with slime trampolines

Add&fix comments Add method to get the starting position of the piston head Split out common code in computeCollisionOffset and checkCollision

# Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

TODO deduplicate code TODO fix empty retracting sticky pistons

connector/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java

connector/src/main/java/org/geysermc/connector/utils/Direction.java

...ain/java/org/geysermc/connector/network/translators/java/world/JavaBlockValueTranslator.java

May want to reduce it to 64 blocks, since Bedrock does not render moving blocks outside this range.

Redned235

Awesome work! Few nitpicks but generally most everything looks great.

bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/world/GeyserPistonEvents.java

connector/src/main/java/org/geysermc/connector/network/session/cache/PistonCache.java

...tor/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java

connector/src/main/java/org/geysermc/connector/utils/PistonBehavior.java

connector/src/main/java/org/geysermc/connector/utils/Direction.java

connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java

connector/src/main/java/org/geysermc/connector/utils/Axis.java

...tor/src/main/java/org/geysermc/connector/network/translators/collision/CollisionManager.java

...in/java/org/geysermc/connector/network/translators/collision/translators/BlockCollision.java

Camotoy · 2021-09-06T23:48:11Z

...in/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java

+     */
+    private void removeBlocks() {
+        for (Vector3i blockPos : attachedBlocks.keySet()) {
+            ChunkUtils.updateBlock(session, BlockStateValues.JAVA_AIR_ID, blockPos);


If this method is only called for visuals, I would rather it just call the update block methods manually so we don't even touch the chunk cache, unless we need the chunk cache to match.

...in/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java

🤦

Addressed.

davchoo added 6 commits November 10, 2020 20:18

Add PistonBlockEntity and cache it

7fbb784

Merge branch 'master' into smoothpistons

692fe98

Move blocks smoothly

b532795

Edit comments & add additional checks for adjacent blocks

746b504

Fix moving pistons

Fix phantom piston heads and sticky block handling

3af2c3e

Fix buggy moving pistons

f3ab643

Camotoy reviewed Nov 15, 2020

View reviewed changes

...in/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java Outdated Show resolved Hide resolved

...in/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java Outdated Show resolved Hide resolved

Add check for sticky pistons when pulling

7764b4d

davchoo added 9 commits November 15, 2020 16:27

Change default piston behavior to normal

a88ca41

Merge branch 'master' into smoothpistons

86d6c1e

# Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java # connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java # connector/src/main/resources/mappings

Changes for 1.16.100

452b3a9

Merge branch 'master' into smoothpistons

4608eed

# Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java # connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java # connector/src/main/resources/mappings

Merge branch 'master' into smoothpistons

4d04a72

Update mappings

a8b53fe

Merge branch 'master' into smoothpistons

b6b7daa

Add collision helper functions

acfee3f

Somewhat fix pistons pushing players

3c38e7b

Camotoy reviewed Nov 24, 2020

View reviewed changes

...in/java/org/geysermc/connector/network/translators/world/block/entity/PistonBlockEntity.java Outdated Show resolved Hide resolved

Send SetEntityMotion Packet to launch players on Slime blocks

397bd54

davchoo added 2 commits November 25, 2020 00:01

Check collision with piston head + send corrected pos to server

b41757d

Shrink player collision slightly

e97dbc5

davchoo added 3 commits November 25, 2020 20:27

Only call collisionManager.correctPlayerPosition once

7b6a6ce

Use runtime ids to check for slime and honey blocks

30386ba

Add movement for standing on honey blocks

e681e60

davchoo and others added 12 commits August 21, 2021 19:59

Disable player piston movement checks when there is no moving pistons

c0fb654

Use Bukkit events for finding piston attached blocks

c6ff755

Add some comments

69217cd

1.12 compatibility

0a24dc3

Extend collidable blocks volume and use IntSet for isPistonHead

48e5d18

Fix moving_piston check

1963233

Fix pushing players in compost bins!

798474b

Remove unnecessary offset for movingBlockMap

6fc4dc6

Fix moving_block in front of pistons

15603ef

Place pistonArmCollision + minor changes

0f4a522

Hopefully fixes issues with slime trampolines

Attempt to clean up code

0f39917

Add&fix comments Add method to get the starting position of the piston head Split out common code in computeCollisionOffset and checkCollision

Merge branch 'master' into smoothpistons

478f476

SupremeMortal force-pushed the master branch from 26c7553 to ab2f5b3 Compare August 31, 2021 10:41

davchoo added 3 commits September 2, 2021 21:50

Merge branch 'master' into smoothpistons

69aa80c

# Conflicts: # connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

Merge remote-tracking branch 'camotoy/smoothpistons' into smoothpistons

ddf339c

Fix ghost blocks on Spigot and move some code

aeec2e1

TODO deduplicate code TODO fix empty retracting sticky pistons

davchoo force-pushed the smoothpistons branch from 2e0a120 to aeec2e1 Compare September 4, 2021 00:38

Fix empty retracting sticky pistons on Spigot

3ddf2dc

Camotoy reviewed Sep 4, 2021

View reviewed changes

davchoo and others added 3 commits September 4, 2021 16:03

Fix stuff from review

1c0806f

Run attached blocks calculations just once

aaa4914

Add distance check for Spigot piston event

d8644cb

May want to reduce it to 64 blocks, since Bedrock does not render moving blocks outside this range.

Redned235 previously requested changes Sep 6, 2021

View reviewed changes

Fix stuff from review

affcd5f

Camotoy requested changes Sep 6, 2021

View reviewed changes

davchoo added 2 commits September 6, 2021 20:25

Fix more stuff from review

abcda69

Fix block duplication

6da9de6

🤦

Camotoy approved these changes Sep 10, 2021

View reviewed changes

Camotoy merged commit 8461cf7 into GeyserMC:master Sep 10, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Smooth Pistons #1542

Smooth Pistons #1542

davchoo commented Nov 15, 2020 •

edited

Loading

Camotoy left a comment

Camotoy commented Nov 15, 2020

davchoo commented Nov 15, 2020

Camotoy commented Nov 15, 2020

Camotoy commented Nov 24, 2020 •

edited

Loading

zimzaza4 commented Nov 25, 2020

davchoo commented Nov 26, 2020

Redned235 left a comment

Camotoy Sep 6, 2021 •

edited

Loading

Smooth Pistons #1542

Smooth Pistons #1542

Conversation

davchoo commented Nov 15, 2020 • edited Loading

Camotoy left a comment

Choose a reason for hiding this comment

Camotoy commented Nov 15, 2020

davchoo commented Nov 15, 2020

Camotoy commented Nov 15, 2020

Camotoy commented Nov 24, 2020 • edited Loading

zimzaza4 commented Nov 25, 2020

davchoo commented Nov 26, 2020

Redned235 left a comment

Choose a reason for hiding this comment

Camotoy Sep 6, 2021 • edited Loading

Choose a reason for hiding this comment

davchoo commented Nov 15, 2020 •

edited

Loading

Camotoy commented Nov 24, 2020 •

edited

Loading

Camotoy Sep 6, 2021 •

edited

Loading