From 5a2b8d5cdc74b20c4d8dc900334a2f78640ec0b5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 14 Jan 2018 17:15:27 -0500
Subject: [PATCH] Move definition of fields up

---
 Spigot-Server-Patches/MC-Utils.patch | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Spigot-Server-Patches/MC-Utils.patch b/Spigot-Server-Patches/MC-Utils.patch
index 911c30ccc5..254a7de0db 100644
--- a/Spigot-Server-Patches/MC-Utils.patch
+++ b/Spigot-Server-Patches/MC-Utils.patch
@@ -52,20 +52,21 @@ index 1f2fe87b6..2cb462b8e 100644
      protected DataPalette c;
      private int e;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index ba461ad48..66c270493 100644
+index ba461ad48..2359b31f4 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
-@@ -0,0 +0,0 @@ public class EntityTypes {
-         a("zombie_villager", 5651507, 7969893);
-         EntityTypes.d.add(EntityTypes.a);
-     }
+@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
+ 
+ public class EntityTypes {
+ 
 +    // Paper start
 +    public static Map<Class<? extends Entity>, MinecraftKey> clsToKeyMap = new java.util.HashMap<>();
 +    public static Map<Class<? extends Entity>, org.bukkit.entity.EntityType> clsToTypeMap = new java.util.HashMap<>();
 +    // Paper end
- 
-     private static void a(int i, String s, Class<? extends Entity> oclass, String s1) {
-         try {
++
+     public static final MinecraftKey a = new MinecraftKey("lightning_bolt");
+     private static final MinecraftKey e = new MinecraftKey("player");
+     private static final Logger f = LogManager.getLogger();
 @@ -0,0 +0,0 @@ public class EntityTypes {
  
              EntityTypes.b.a(i, minecraftkey, oclass);