Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

Kick git and rebuild patches

Browse Source
This commit is contained in:
Zach Brown 2016-08-15 19:22:10 -05:00
parent d5057a1488
commit 17c9d7d9da
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-API-Patches/0003-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 66c42230687e40a584225b2a7a1daf0857ab84de Mon Sep 17 00:00:00 2001
From 64bb83cd32c749108201aae7c8e4575a5ef0e4fe Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -2999,7 +2999,7 @@ index e2fc282..66385c4 100644
// Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
deleted file mode 100644
index fc59aa3..0000000
index a8f61f2..0000000
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ /dev/null
@@ -1,253 +0,0 @@
@ -3233,20 +3233,20 @@ index fc59aa3..0000000
- {
- try
- {
- HttpURLConnection con = (HttpURLConnection) new URL( "http://paste.ubuntu.com/" ).openConnection();
- HttpURLConnection con = (HttpURLConnection) new URL( "https://timings.spigotmc.org/paste" ).openConnection();
- con.setDoOutput( true );
- con.setRequestMethod( "POST" );
- con.setInstanceFollowRedirects( false );
-
- OutputStream out = con.getOutputStream();
- out.write( "poster=Spigot&syntax=text&content=".getBytes( "UTF-8" ) );
- out.write( URLEncoder.encode( bout.toString( "UTF-8" ), "UTF-8" ).getBytes( "UTF-8" ) );
- out.write( bout.toByteArray() );
- out.close();
-
- com.google.gson.JsonObject location = new com.google.gson.Gson().fromJson(new java.io.InputStreamReader(con.getInputStream()), com.google.gson.JsonObject.class);
- con.getInputStream().close();
-
- String location = con.getHeaderField( "Location" );
- String pasteID = location.substring( "http://paste.ubuntu.com/".length(), location.length() - 1 );
- sender.sendMessage( ChatColor.GREEN + "Timings results can be viewed at http://www.spigotmc.org/go/timings?url=" + pasteID );
- String pasteID = location.get( "key" ).getAsString();
- sender.sendMessage( ChatColor.GREEN + "Timings results can be viewed at https://www.spigotmc.org/go/timings?url=" + pasteID );
- } catch ( IOException ex )
- {
- sender.sendMessage( ChatColor.RED + "Error pasting timings, check your console for more information" );

8
Spigot-API-Patches/0006-Add-async-chunk-load-API.patch
View File

@ -1,14 +1,14 @@
From 410427fe9f7aa75592d7ba4aec7cfc78ae868da7 Mon Sep 17 00:00:00 2001
From 90daaa2067899aa0bea025e45ee3e98ad862275a 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 d088c3c..d16facb 100644
index 339afe4..ce92fef 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -130,6 +130,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -135,6 +135,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
public Chunk getChunkAt(Block block);
/**
@ -88,5 +88,5 @@ index d088c3c..d16facb 100644
*
* @param chunk The chunk to check
--
2.8.0
2.9.2.windows.1

8
Spigot-Server-Patches/0064-Ensure-inv-drag-is-in-bounds.patch
View File

@ -1,14 +1,14 @@
From 10427e51ebb1dbd175da88010c0ba5cc0cf509e5 Mon Sep 17 00:00:00 2001
From 64331394e7398883d753bf51736ac1f9144705e1 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:33:53 -0600
Subject: [PATCH] Ensure inv drag is in bounds
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
index 23af626..97da4c0 100644
index 02b1fb1..d39ffbe 100644
--- a/src/main/java/net/minecraft/server/Container.java
+++ b/src/main/java/net/minecraft/server/Container.java
@@ -141,7 +141,7 @@ public abstract class Container {
@@ -142,7 +142,7 @@ public abstract class Container {
this.d();
}
} else if (this.g == 1) {
@ -18,5 +18,5 @@ index 23af626..97da4c0 100644
if (slot != null && a(slot, playerinventory.getCarried(), true) && slot.isAllowed(playerinventory.getCarried()) && playerinventory.getCarried().count > this.h.size() && this.b(slot)) {
this.h.add(slot);
--
2.9.0
2.9.2.windows.1