Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-07 17:16:57 +10:00
parent fe5a2d46bd
commit 3eb0f032f0
13 changed files with 48 additions and 55 deletions

View File

@@ -1,14 +1,14 @@
From 36b0eed14a6230d0e47ac5484186ce568ae60490 Mon Sep 17 00:00:00 2001
From 9836664f97abdff7f7eaa35ee496e496976270e0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a809f18..fb21501 100644
index be2f4dc..cb99199 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -725,6 +725,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -729,6 +729,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}