Update upstream

This commit is contained in:
William Blake Galbreath
2019-05-24 03:31:21 -05:00
parent c9747fbda3
commit d67b8b876c
4 changed files with 9 additions and 9 deletions

View File

@@ -1,4 +1,4 @@
From fe8f0a3e4e712232fa71d0296a24ce1a4c62f0e6 Mon Sep 17 00:00:00 2001
From 1e655261f55aa2c8547e09d05bc7f5a910757ab2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -83,10 +83,10 @@ index cd6e25923..bb227bc0f 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f1cd38d42..d3316a6ac 100644
index 184f1b00f..5bd0a4cc7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1396,7 +1396,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1408,7 +1408,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {