twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-06 15:12:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  Remove no longer needed tests due to last change
This commit is contained in:
Aikar
2018-09-09 01:14:52 -04:00
parent ae158dbbc8 e0c865681c
commit f848af3df4
5 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add Force-Loaded Chunk API
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
index dc847340..51bc051f 100644
index dc847340f..51bc051f7 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -0,0 +0,0 @@ public interface Chunk {
@@ -30,7 +30,7 @@ index dc847340..51bc051f 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 53764fae..00b02e36 100644
index 53764fae6..00b02e36f 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -50,6 +50,4 @@ index 53764fae..00b02e36 100644
// Paper end
/**
--
2.19.0.rc1
--