MineNet/Minigames
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Elias Müller 2024-12-23 23:55:35 +01:00
commit 7ced598bfd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/tetris/Tetris.java
View File

@ -102,7 +102,7 @@ class Tetris extends StatelessGame {
double forwardAmount = movementVector.dot(forward); double forwardAmount = movementVector.dot(forward);
double leftAmount = movementVector.dot(left); double leftAmount = movementVector.dot(left);
double buttonPressAmount = 0.018; double buttonPressAmount = 0.05;
if (forwardAmount > buttonPressAmount) { if (forwardAmount > buttonPressAmount) {
tetrisGame.pressedButton(TetrisGame.Button.W); tetrisGame.pressedButton(TetrisGame.Button.W);
} else if (forwardAmount < -buttonPressAmount) { } else if (forwardAmount < -buttonPressAmount) {

2
src/main/java/eu/mhsl/minenet/minigames/score/tournament/TournamentDisplay.java
View File

@ -30,6 +30,8 @@ public class TournamentDisplay extends MineNetInstance implements Spawnable {
this.places = tournament.getPlaces(); this.places = tournament.getPlaces();
this.tournament = tournament; this.tournament = tournament;
this.places.forEach(player -> player.setGameMode(GameMode.ADVENTURE));
eventNode().addListener(PlayerMoveEvent.class, playerMoveEvent -> { eventNode().addListener(PlayerMoveEvent.class, playerMoveEvent -> {
if(isOnDisplay(playerMoveEvent.getPlayer()) && !playerMoveEvent.getNewPosition().sameBlock(placePositions[getRankPosition(playerMoveEvent.getPlayer())])) { if(isOnDisplay(playerMoveEvent.getPlayer()) && !playerMoveEvent.getNewPosition().sameBlock(placePositions[getRankPosition(playerMoveEvent.getPlayer())])) {
playerMoveEvent.setCancelled(true); playerMoveEvent.setCancelled(true);