[SPIGOT-946] Begin making use of access transforms to simplify patching.

1 files changed, 2 insertions, 13 deletions

diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch
index f4da9008..7902a219 100644
--- a/nms-patches/MinecraftServer.patch
+++ b/nms-patches/MinecraftServer.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -38,14 +38,27 @@
+@@ -38,6 +38,19 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -19,18 +19,7 @@
 +
  public abstract class MinecraftServer implements Runnable, ICommandListener, IAsyncTaskHandler, IMojangStatistics {
  
--    private static final Logger LOGGER = LogManager.getLogger();
-+    public static final Logger LOGGER = LogManager.getLogger(); // CraftBukkit - make public
-     public static final File a = new File("usercache.json");
-     private static MinecraftServer l;
--    private final Convertable convertable;
-+    public Convertable convertable; // CraftBukkit - remove final, public
-     private final MojangStatisticsGenerator n = new MojangStatisticsGenerator("server", this, az());
--    private final File universe;
-+    public File universe; // CraftBukkit - remove final, public
-     private final List<IUpdatePlayerListBox> p = Lists.newArrayList();
-     protected final ICommandHandler b;
-     public final MethodProfiler methodProfiler = new MethodProfiler();
+     public static final Logger LOGGER = LogManager.getLogger();
 @@ -94,19 +107,61 @@
      private Thread serverThread;
      private long ab = az();