From be9e9efebc54a765d7361a4217a87f0370811694 Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Sat, 17 Oct 2020 16:37:41 -0400
Subject: [PATCH] Fix More Stuff

---
 .../usr/share/minecraft-pi/client/docker-compose.yml      | 2 +-
 .../usr/share/minecraft-pi/client/docker-compose.yml      | 2 +-
 .../usr/share/minecraft-pi/server/docker-compose.yml      | 2 +-
 mods/src/compat.c                                         | 8 ++++----
 mods/src/core.c                                           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/client/native/usr/share/minecraft-pi/client/docker-compose.yml b/debian/client/native/usr/share/minecraft-pi/client/docker-compose.yml
index 9161610..d82a6d3 100644
--- a/debian/client/native/usr/share/minecraft-pi/client/docker-compose.yml
+++ b/debian/client/native/usr/share/minecraft-pi/client/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3'
 services:
     minecraft-pi:
         image: 'thebrokenrail/minecraft-pi:client'
diff --git a/debian/client/virgl/usr/share/minecraft-pi/client/docker-compose.yml b/debian/client/virgl/usr/share/minecraft-pi/client/docker-compose.yml
index 3295d71..eed0316 100644
--- a/debian/client/virgl/usr/share/minecraft-pi/client/docker-compose.yml
+++ b/debian/client/virgl/usr/share/minecraft-pi/client/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3'
 services:
     minecraft-pi:
         image: 'thebrokenrail/minecraft-pi:client'
diff --git a/debian/server/usr/share/minecraft-pi/server/docker-compose.yml b/debian/server/usr/share/minecraft-pi/server/docker-compose.yml
index 231d683..106588f 100644
--- a/debian/server/usr/share/minecraft-pi/server/docker-compose.yml
+++ b/debian/server/usr/share/minecraft-pi/server/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3'
 services:
     minecraft-pi-server:
         image: 'thebrokenrail/minecraft-pi:server'
diff --git a/mods/src/compat.c b/mods/src/compat.c
index fd8b0d3..992ff93 100644
--- a/mods/src/compat.c
+++ b/mods/src/compat.c
@@ -466,11 +466,11 @@ HOOK(eglTerminate, EGLBoolean, (__attribute__((unused)) EGLDisplay display)) {
 // Use VirGL
 __attribute__((constructor)) static void init() {
     int mode = extra_get_mode();
-    if (mode == 0) {
+    if (mode != 1) {
         setenv("LIBGL_ALWAYS_SOFTWARE", "1", 1);
-        if (!is_server) {
-            setenv("GALLIUM_DRIVER", "virpipe", 1);
-        }
+    }
+    if (mode == 0) {
+        setenv("GALLIUM_DRIVER", "virpipe", 1);
     }
     is_server = mode == 2;
 }
diff --git a/mods/src/core.c b/mods/src/core.c
index 64fb2e2..cd6f5ee 100644
--- a/mods/src/core.c
+++ b/mods/src/core.c
@@ -70,7 +70,7 @@ void _patch(const char *file, int line, void *start, unsigned char patch[]) {
 
     mprotect((void *) page_start, end - page_start, PROT_READ | PROT_EXEC);
 
-    __builtin___clear_cache(start, (void *) end);
+    __clear_cache(start, end);
 }
 
 void _patch_address(const char *file, int line, void *start, void *target) {