Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

More compile fixes

Browse Source
This commit is contained in:
Zach Brown
2019-12-12 19:18:18 -06:00
parent b0dc983f21
commit 4565495711
30 changed files with 230 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
View File

@@ -1,4 +1,4 @@
From abd5f22ee2480d2a88bb8d450e212b6788ea857c Mon Sep 17 00:00:00 2001
From eceb81a7db137272593422ec5de6c890ba92f9d4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 22:11:48 -0500
Subject: [PATCH] Basic PlayerProfile API
@@ -403,7 +403,7 @@ index 000000000..3aceb0ea8
+ }
+}
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
index 1f6a12632..6d278a0da 100644
index 2f10dab36..670f8313a 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -1,7 +1,10 @@
@@ -450,7 +450,7 @@ index 7df3ae0ec..1ddb10741 100644
return this.minecraftSessionService;
}
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
index e8143eff4..10935bcf3 100644
index 581199e6d..a072222bc 100644
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -43,7 +43,7 @@ public class UserCache {
@@ -473,10 +473,10 @@ index e8143eff4..10935bcf3 100644
+ }
+ // Paper end
+
@Nullable public GameProfile getProfile(UUID uuid) { return a(uuid); } // Paper - OBFHELPER
@Nullable
public GameProfile getProfile(UUID uuid) {
@@ -274,7 +281,7 @@ public class UserCache {
UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.e.get(uuid);
@@ -273,7 +280,7 @@ public class UserCache {
class UserCacheEntry {
@@ -525,5 +525,5 @@ index 202f6ad68..2f7769c00 100644
// Paper end
}
--
2.17.1
2.24.0