Organise imports

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-03-09 08:47:33 +11:00
parent 1ae7bcc4d0
commit b2efd58164
188 changed files with 879 additions and 825 deletions

View File

@@ -1,18 +1,19 @@
--- a/net/minecraft/server/EntityExperienceOrb.java
+++ b/net/minecraft/server/EntityExperienceOrb.java
@@ -1,6 +1,11 @@
package net.minecraft.server;
@@ -2,6 +2,12 @@
import java.util.Map.Entry;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
+// CraftBukkit end
+
public class EntityExperienceOrb extends Entity {
@@ -36,6 +41,7 @@
public int b;
@@ -36,6 +42,7 @@
@Override
public void tick() {
super.tick();
@@ -20,7 +21,7 @@
if (this.d > 0) {
--this.d;
}
@@ -72,7 +78,22 @@
@@ -72,7 +79,22 @@
this.targetPlayer = null;
}
@@ -44,7 +45,7 @@
Vec3D vec3d = new Vec3D(this.targetPlayer.locX() - this.locX(), this.targetPlayer.locY() + (double) this.targetPlayer.getHeadHeight() / 2.0D - this.locY(), this.targetPlayer.locZ() - this.locZ());
double d1 = vec3d.g();
@@ -155,13 +176,19 @@
@@ -155,13 +177,19 @@
if (!itemstack.isEmpty() && itemstack.f()) {
int i = Math.min(this.c(this.value), itemstack.getDamage());
@@ -67,7 +68,7 @@
}
this.die();
@@ -183,6 +210,24 @@
@@ -183,6 +211,24 @@
}
public static int getOrbValue(int i) {