core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move definition of fields up

This commit is contained in:
Aikar 2018-01-14 17:15:27 -05:00
parent 6a5948b316
commit b98f8232e8
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Spigot-Server-Patches/0005-MC-Utils.patch
View File

@ -1,4 +1,4 @@
From c44f974b3550e4eadae976624a6184c3fd8d78a3 Mon Sep 17 00:00:00 2001 From ef3107eb89bc63806994147d6f0ad1c5def5162f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:55:47 -0400 Date: Mon, 28 Mar 2016 20:55:47 -0400
Subject: [PATCH] MC Utils Subject: [PATCH] MC Utils
@ -52,21 +52,22 @@ index 1f2fe87b6..2cb462b8e 100644
protected DataPalette c; protected DataPalette c;
private int e; private int e;
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java 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 --- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -237,6 +237,10 @@ public class EntityTypes { @@ -13,6 +13,11 @@ import org.apache.logging.log4j.Logger;
a("zombie_villager", 5651507, 7969893);
EntityTypes.d.add(EntityTypes.a); public class EntityTypes {
}
+ // Paper start + // Paper start
+ public static Map<Class<? extends Entity>, MinecraftKey> clsToKeyMap = new java.util.HashMap<>(); + 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<>(); + public static Map<Class<? extends Entity>, org.bukkit.entity.EntityType> clsToTypeMap = new java.util.HashMap<>();
+ // Paper end + // Paper end
+
private static void a(int i, String s, Class<? extends Entity> oclass, String s1) { public static final MinecraftKey a = new MinecraftKey("lightning_bolt");
try { private static final MinecraftKey e = new MinecraftKey("player");
@@ -252,6 +256,8 @@ public class EntityTypes { private static final Logger f = LogManager.getLogger();
@@ -252,6 +257,8 @@ public class EntityTypes {
EntityTypes.b.a(i, minecraftkey, oclass); EntityTypes.b.a(i, minecraftkey, oclass);
EntityTypes.d.add(minecraftkey); EntityTypes.d.add(minecraftkey);