2013-08-04 06:51:09 +08:00
|
|
|
From b2fceb79c1539564a17de3eb86d2fb7be3f3c385 Mon Sep 17 00:00:00 2001
|
2013-06-02 13:15:15 +08:00
|
|
|
From: md_5 <md_5@live.com.au>
|
|
|
|
Date: Sun, 2 Jun 2013 15:10:56 +1000
|
|
|
|
Subject: [PATCH] Skeleton API Implementations
|
|
|
|
|
|
|
|
|
2013-06-02 14:15:22 +08:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2013-08-04 06:51:09 +08:00
|
|
|
index e8315dd..fc71833 100644
|
2013-06-02 14:15:22 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2013-08-04 06:51:09 +08:00
|
|
|
@@ -1267,4 +1267,14 @@ public class CraftWorld implements World {
|
2013-06-02 14:15:22 +08:00
|
|
|
cps.queueUnload(chunk.x, chunk.z);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+ // Spigot start
|
|
|
|
+ private final Spigot spigot = new Spigot()
|
|
|
|
+ {
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ public Spigot spigot()
|
|
|
|
+ {
|
|
|
|
+ return spigot;
|
|
|
|
+ }
|
|
|
|
+ // Spigot end
|
|
|
|
}
|
2013-06-02 13:15:15 +08:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
2013-08-03 17:59:46 +08:00
|
|
|
index b46b9c4..a386001 100644
|
2013-06-02 13:15:15 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
|
2013-08-03 17:59:46 +08:00
|
|
|
@@ -40,4 +40,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
|
2013-06-02 13:15:15 +08:00
|
|
|
public EntityType getType() {
|
|
|
|
return EntityType.ARROW;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
2013-08-03 17:59:46 +08:00
|
|
|
+ private final Arrow.Spigot spigot = new Arrow.Spigot()
|
2013-06-02 13:15:15 +08:00
|
|
|
+ {
|
|
|
|
+ };
|
2013-08-03 17:59:46 +08:00
|
|
|
+
|
|
|
|
+ public Arrow.Spigot spigot()
|
2013-06-02 13:15:15 +08:00
|
|
|
+ {
|
|
|
|
+ return spigot;
|
|
|
|
+ }
|
2013-08-03 17:54:36 +08: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-08-04 06:51:09 +08:00
|
|
|
index d9659fb..4f4b84f 100644
|
2013-08-03 17:54:36 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2013-08-04 06:51:09 +08:00
|
|
|
@@ -398,4 +398,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2013-08-03 17:54:36 +08:00
|
|
|
|
|
|
|
return getHandle().vehicle.getBukkitEntity();
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
|
|
|
+ private final Spigot spigot = new Spigot()
|
|
|
|
+ {
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ public Spigot spigot()
|
|
|
|
+ {
|
|
|
|
+ return spigot;
|
|
|
|
+ }
|
2013-06-02 13:22:22 +08:00
|
|
|
+ // Spigot end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2013-08-03 17:59:46 +08:00
|
|
|
index d5d43c9..3cf0c28 100644
|
2013-06-02 13:22:22 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2013-08-03 16:45:50 +08:00
|
|
|
@@ -1072,4 +1072,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2013-07-24 17:29:30 +08:00
|
|
|
}
|
|
|
|
collection.add(new AttributeModifiable(getHandle().aW(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
|
2013-06-02 13:22:22 +08:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Spigot start
|
2013-08-03 17:59:46 +08:00
|
|
|
+ private final Player.Spigot spigot = new Player.Spigot()
|
2013-06-02 13:22:22 +08:00
|
|
|
+ {
|
|
|
|
+ };
|
|
|
|
+
|
2013-08-03 17:59:46 +08:00
|
|
|
+ public Player.Spigot spigot()
|
2013-06-02 13:22:22 +08:00
|
|
|
+ {
|
|
|
|
+ return spigot;
|
|
|
|
+ }
|
2013-06-02 13:15:15 +08:00
|
|
|
+ // Spigot end
|
|
|
|
}
|
|
|
|
--
|
|
|
|
1.8.1.2
|
|
|
|
|