diff --git a/.gitignore b/.gitignore index 9154f4c7..66da6e9d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ hs_err_pid* replay_pid* +*.idea/ +Server.iml +*.gitignore diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index b60a8024..0a68e754 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -286,6 +286,7 @@ public class PlayerCharacter extends AbstractCharacter { public void updateBounds() { this.playerBounds.setBounds(this); this.checkCollisionsWithOtherPlayers(); + // This is a test to see if it will push to the docker container } public void checkCollisionsWithOtherPlayers() {