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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-01-31 20:42:29 +00:00
parent 161ec4151b
commit 99ececedb4
23 changed files with 113 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View File

@@ -1,11 +1,11 @@
From ca8e45f5c2141df3b4d582b22662715a2f1fffe1 Mon Sep 17 00:00:00 2001
From 8ee072a2329fa1ab8b7540a18c633dd8dee8d549 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
index 3d0383d..c16413a 100644
index 2c1fbb5..965d860 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1280,4 +1280,14 @@ public class CraftWorld implements World {
@@ -24,12 +24,12 @@ index 3d0383d..c16413a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
index b46b9c4..a386001 100644
index 4c319a7..328c73f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -40,4 +40,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
public EntityType getType() {
return EntityType.ARROW;
@@ -71,4 +71,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
public void _INVALID_setShooter(LivingEntity shooter) {
getHandle().shooter = ((CraftLivingEntity) shooter).getHandle();
}
+
+ // Spigot start
@@ -84,5 +84,5 @@ index 9935e7a..6b7fcfc 100644
+ // Spigot end
}
--
1.8.3.2
1.8.4.msysgit.0