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,17 +1,18 @@
--- a/net/minecraft/server/TileEntityConduit.java
+++ b/net/minecraft/server/TileEntityConduit.java
@@ -6,6 +6,10 @@
import java.util.Random;
@@ -7,6 +7,11 @@
import java.util.UUID;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+// CraftBukkit end
+
public class TileEntityConduit extends TileEntity implements ITickable {
@@ -158,7 +162,7 @@
private static final Block[] b = new Block[]{Blocks.PRISMARINE, Blocks.PRISMARINE_BRICKS, Blocks.SEA_LANTERN, Blocks.DARK_PRISMARINE};
@@ -158,7 +163,7 @@
EntityHuman entityhuman = (EntityHuman) iterator.next();
if (this.position.a((BaseBlockPosition) entityhuman.getChunkCoordinates(), (double) j) && entityhuman.isInWaterOrRain()) {
@@ -20,7 +21,7 @@
}
}
@@ -175,7 +179,7 @@
@@ -175,7 +180,7 @@
this.target = this.x();
this.k = null;
} else if (this.target == null) {
@@ -29,7 +30,7 @@
return entityliving1 instanceof IMonster && entityliving1.isInWaterOrRain();
});
@@ -187,8 +191,13 @@
@@ -187,8 +192,13 @@
}
if (this.target != null) {
@@ -45,7 +46,7 @@
}
if (entityliving != this.target) {
@@ -221,7 +230,7 @@
@@ -221,7 +231,7 @@
@Nullable
private EntityLiving x() {