From a344a23bb9d44cc32134a1e6b73e74b8c543d01c Mon Sep 17 00:00:00 2001
From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com>
Date: Sat, 25 Jun 2022 17:59:48 +1000
Subject: [PATCH] Fix collision bug in dark world and edit readme.md (#134)

---
 README.md                        | 2 +-
 src/game/mario.c                 | 4 +++-
 src/pc/network/discord/discord.c | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 02b1604a..48b80e95 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Run `./extract_assets.py --clean && make clean` or `make distclean` to remove RO
 ## Goal (accomplished)
 Create a mod for the PC port where multiple people can play online together.
 
-Unlike previous online attempts, this one synchronized enemies and events. This allows player to be interacting with the same world at the same time.
+Unlike previous online attempts, this one synchronized enemies and events. This allows players to be interacting with the same world at the same time.
 
 ## Discord
 [https://discord.gg/TJVKHS4](https://discord.gg/TJVKHS4)
diff --git a/src/game/mario.c b/src/game/mario.c
index 175082d4..d1c22e42 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -624,8 +624,10 @@ f32 vec3f_find_ceil(Vec3f pos, f32 height, struct Surface **ceil) {
 f32 vec3f_mario_ceil(Vec3f pos, f32 height, struct Surface **ceil) {
     if (gServerSettings.fixCollisionBugs) {
         height = MAX(height + 80.0f, pos[1] - 2);
+        return find_ceil(pos[0], height, pos[2], ceil);
+    } else {
+        return vec3f_find_ceil(pos, height, ceil);
     }
-    return find_ceil(pos[0], height, pos[2], ceil);
 }
 
 /**
diff --git a/src/pc/network/discord/discord.c b/src/pc/network/discord/discord.c
index 4343d8e1..a13f5e21 100644
--- a/src/pc/network/discord/discord.c
+++ b/src/pc/network/discord/discord.c
@@ -28,7 +28,7 @@ static void discord_sdk_log_callback(UNUSED void* hook_data, enum EDiscordLogLev
 }
 
 void discord_fatal_message(int rc) {
-    return; // TODO FIGURE OUT WHY DISCORD DOES THIS
+    return; // Discord usually does this because of loss of connection to Discord
     char errorMessage[132] = { 0 };
     snprintf(errorMessage, 132, "Discord threw an error.\nTo fix: \n1. Close the game.\n2. Restart Discord.\n3. Start the game.\nRC: %d", rc);
     djui_popup_create(errorMessage, 6);