mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream Merge

Browse source
This commit is contained in:
md_5 2013-08-04 08:51:09 +10:00
parent 70a75c0b48
commit 843c21ddf8
11 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -1,14 +1,14 @@
From 880a779913939ebd2e21755be3251bf62e40ae7a Mon Sep 17 00:00:00 2001
From b2fceb79c1539564a17de3eb86d2fb7be3f3c385 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 75b1fb2..8881878 100644
index e8315dd..fc71833 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1265,4 +1265,14 @@ public class CraftWorld implements World {
@@ -1267,4 +1267,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.x, chunk.z);
}
}
@ -44,10 +44,10 @@ index b46b9c4..a386001 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 8e2e5cd..b1f86a0 100644
index d9659fb..4f4b84f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -397,4 +397,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -398,4 +398,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return getHandle().vehicle.getBukkitEntity();
}