Merge branch 'main' into multi

This commit is contained in:
Raphaël 2024-01-08 20:35:10 +00:00
commit 295a032ce5

View file

@ -480,11 +480,13 @@ def __collision_with_ball(a: Entity, b: Entity):
"""
if Ball in a:
a.world.new_entity().set(Sound("bound.mp3"))
if Player1 in b or Player2 in b and Ball in a:
if Player1 in b or Player2 in b:
if Ball in a:
# Met a jour le dernier joueur a avoir touché la balle
for player in a.world.query(LastPlayerTurn):
del player[LastPlayerTurn]
b.set(LastPlayerTurn())
print(b)
return __bounce_on_player(a, b)
return True