SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fixes (#2732)

Browse Source
This commit is contained in:
MiniDigger | Martin
2019-12-12 19:45:00 +01:00
parent 3360d06f76
commit 8199a18b2b
28 changed files with 90 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/MC-Utils.patch
View File

@@ -473,7 +473,7 @@ index 06360cf7c..8e8fab497 100644
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
new file mode 100644
index 000000000..c96f3ed17
index 000000000..628b73a12
--- /dev/null
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -0,0 +0,0 @@
@@ -660,7 +660,7 @@ index 000000000..c96f3ed17
+ * @return
+ */
+ public static double distanceSq(Entity e1, Entity e2) {
+ return distanceSq(e1.locX,e1.locY,e1.locZ, e2.locX,e2.locY,e2.locZ);
+ return distanceSq(e1.locX(),e1.locY(),e1.locZ(), e2.locX(),e2.locY(),e2.locZ());
+ }
+
+ /**
@@ -715,7 +715,7 @@ index 000000000..c96f3ed17
+ * @return
+ */
+ public static Location toLocation(Entity entity) {
+ return new Location(entity.getWorld().getWorld(), entity.locX, entity.locY, entity.locZ);
+ return new Location(entity.getWorld().getWorld(), entity.locX(), entity.locY(), entity.locZ());
+ }
+
+ public static org.bukkit.block.Block toBukkitBlock(World world, BlockPosition pos) {