testserver/CraftBukkit-Patches/0003-Skeleton-API-Implement...

89 lines
2.9 KiB
Diff
Raw Normal View History

2014-02-12 13:48:26 +00:00
From ec47c27cbee89a54bc68d4fa7b25b86653034326 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2014-01-31 20:42:29 +00:00
index 2c1fbb5..965d860 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2013-12-18 06:48:18 +00:00
@@ -1280,4 +1280,14 @@ public class CraftWorld implements World {
2013-12-01 03:40:53 +00:00
cps.queueUnload(chunk.locX, chunk.locZ);
}
}
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ {
+ };
+
+ public Spigot spigot()
+ {
+ return spigot;
+ }
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
2014-01-31 20:42:29 +00:00
index 4c319a7..328c73f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
2014-01-31 20:42:29 +00:00
@@ -71,4 +71,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
public void _INVALID_setShooter(LivingEntity shooter) {
getHandle().shooter = ((CraftLivingEntity) shooter).getHandle();
}
+
+ // Spigot start
2013-08-03 09:59:46 +00:00
+ private final Arrow.Spigot spigot = new Arrow.Spigot()
+ {
+ };
2013-08-03 09:59:46 +00:00
+
+ public Arrow.Spigot spigot()
+ {
+ return spigot;
+ }
2013-08-03 09:54:36 +00:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
2013-12-01 03:40:53 +00:00
index fe0f200..e026c1f 100644
2013-08-03 09:54:36 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
2013-12-01 03:40:53 +00:00
@@ -399,4 +399,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
2013-08-03 09:54:36 +00:00
return getHandle().vehicle.getBukkitEntity();
}
+
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ {
+ };
+
+ public Spigot spigot()
+ {
+ return spigot;
+ }
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2014-02-12 13:48:26 +00:00
index 60b0435..573f9a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2014-02-12 13:48:26 +00:00
@@ -1252,4 +1252,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2013-07-24 09:29:30 +00:00
}
2013-12-01 03:40:53 +00:00
collection.add(new AttributeModifiable(getHandle().bc(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
}
+
+ // Spigot start
2013-08-03 09:59:46 +00:00
+ private final Player.Spigot spigot = new Player.Spigot()
+ {
+ };
+
2013-08-03 09:59:46 +00:00
+ public Player.Spigot spigot()
+ {
+ return spigot;
+ }
+ // Spigot end
}
--
2014-01-31 20:42:29 +00:00
1.8.4.msysgit.0