Update upstream B/CB

This commit is contained in:
Zach Brown 2016-12-06 17:12:19 -06:00
parent ebf1094ea5
commit 57c2b8de43
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
10 changed files with 53 additions and 53 deletions

View file

@ -1,14 +1,14 @@
From 38e2ee2f9337fc85740266713d841dada00b1e59 Mon Sep 17 00:00:00 2001
From 8793e6a8cbd642c7d5c8e0572888eea9df36e247 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:43:33 -0600
Subject: [PATCH] Add async chunk load API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 37e6419..4deb492 100644
index e9b1b0a..56f5029 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -136,6 +136,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -137,6 +137,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
public Chunk getChunkAt(Block block);
/**
@ -88,5 +88,5 @@ index 37e6419..4deb492 100644
*
* @param chunk The chunk to check
--
2.10.2.windows.1
2.9.3