2020-03-21 17:29:35 +01:00
|
|
|
From e1b72d3c45a36d430d4ef3b1bde43fbb6784bb5e Mon Sep 17 00:00:00 2001
|
2020-02-26 20:12:29 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 14 Apr 2014 20:44:38 -0400
|
|
|
|
Subject: [PATCH] EMC Disable UUID conversion - Already done
|
|
|
|
|
|
|
|
---
|
|
|
|
src/main/java/net/minecraft/server/DedicatedServer.java | 2 +-
|
|
|
|
.../java/net/minecraft/server/NameReferencingFileConverter.java | 1 +
|
|
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
2020-03-21 17:29:35 +01:00
|
|
|
index ede43693..610826c9 100644
|
2020-02-26 20:12:29 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
2020-03-21 17:29:35 +01:00
|
|
|
@@ -250,7 +250,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
2020-02-26 20:12:29 +01:00
|
|
|
DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (this.convertNames()) {
|
|
|
|
+ if (false) { // EMC - disable UUID Conversion
|
|
|
|
this.getUserCache().c();
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
|
|
|
index d3c2e1be..28656410 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
|
|
|
@@ -425,6 +425,7 @@ public class NameReferencingFileConverter {
|
|
|
|
}
|
|
|
|
|
|
|
|
public static boolean e(MinecraftServer minecraftserver) {
|
|
|
|
+ if (true) return true; // EMC - Disable UUID conversion
|
|
|
|
boolean flag = b();
|
|
|
|
|
|
|
|
flag = flag && f(minecraftserver);
|
|
|
|
--
|
|
|
|
2.25.1.windows.1
|
|
|
|
|