Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Patch rebuild.

This commit is contained in:
md_5 2016-03-12 12:39:07 +11:00 committed by Zach Brown
parent b1e5adbd8a
commit a638cf7e03
12 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bukkit-Patches/0006-Add-Particle-API.patch
View File

@ -1,4 +1,4 @@
From e0d0f0c7b1047c107d22f2c630c6e697e28b007a Mon Sep 17 00:00:00 2001
From c7da54bf804914050256224cc75b4cb98a1dc4c6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
@ -271,10 +271,10 @@ index fe29e1c..f28fecd 100644
+ public enum Type {SOUND, VISUAL, PARTICLE}
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 58f4431..ec6a3a5 100644
index 1e150d1..2d98a7d 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1173,6 +1173,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1187,6 +1187,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);

6
Bukkit-Patches/0020-Silenceable-Lightning-API.patch
View File

@ -1,14 +1,14 @@
From 8ab299c1bea363c835338a258edd9685c25d2d59 Mon Sep 17 00:00:00 2001
From a271da23123d6dfba277272b76329cb9fbb63c38 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ec6a3a5..bafba90 100644
index 2d98a7d..eb24544 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1218,6 +1218,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1232,6 +1232,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
{
throw new UnsupportedOperationException( "Not supported yet." );
}

14
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View File

@ -1,4 +1,4 @@
From 264ff17cfc09c59ab5b65acf5789129069ffe97c Mon Sep 17 00:00:00 2001
From 8c42dbc73322f86252eaede8e0263ebfb01c79bf 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
@ -25,10 +25,10 @@ index d330226..6b37266 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9e0b5af..f85bf83 100644
index 2c82ecb..fb84060 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1481,4 +1481,14 @@ public class CraftWorld implements World {
@@ -1508,4 +1508,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ);
}
}
@ -64,10 +64,10 @@ index dca8520..bf48e6e 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 22d08a2..97dfc54 100644
index 7f10a0f..6290da9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -555,4 +555,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -562,4 +562,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean isGlowing() {
return getHandle().glowing;
}
@ -124,10 +124,10 @@ index 303da2d..01ba89f 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 7c3adbb..e487d52 100644
index 294f6c9..0a5edb5 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -819,4 +819,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -820,4 +820,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
return HANDLED_TAGS;
}
}

10
CraftBukkit-Patches/0008-Async-Operation-Catching.patch
View File

@ -1,4 +1,4 @@
From 3015a566462335939f05cdcbfe7ac43610fc3432 Mon Sep 17 00:00:00 2001
From 25e364121b19e256408c3a304bcfd117ad47e9b5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -106,10 +106,10 @@ index 238f8f3..e0416a8 100644
// this.entityList.addAll(collection);
Iterator iterator = collection.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f85bf83..10e321f 100644
index fb84060..69875c9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -166,6 +166,7 @@ public class CraftWorld implements World {
@@ -169,6 +169,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunkRequest(int x, int z, boolean safe) {
@ -117,7 +117,7 @@ index f85bf83..10e321f 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -176,6 +177,7 @@ public class CraftWorld implements World {
@@ -179,6 +180,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@ -125,7 +125,7 @@ index f85bf83..10e321f 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -258,6 +260,7 @@ public class CraftWorld implements World {
@@ -261,6 +263,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {

6
CraftBukkit-Patches/0010-Spigot-Timings.patch
View File

@ -1,4 +1,4 @@
From c4eee49f085675aeac8c580d46204d985fd586b7 Mon Sep 17 00:00:00 2001
From 8a0b89b0df0a22cc1ff24b60939922b4b1530e4b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -586,10 +586,10 @@ index 91965c0..261b423 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 10e321f..6d94f48 100644
index 69875c9..d132f1a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -271,7 +271,9 @@ public class CraftWorld implements World {
@@ -274,7 +274,9 @@ public class CraftWorld implements World {
net.minecraft.server.Chunk chunk = world.getChunkProviderServer().chunks.get(LongHash.toLong(x, z));
if (chunk == null) {

6
CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch
View File

@ -1,14 +1,14 @@
From 772a09dbea94136c4be681a8afc7dfba35965906 Mon Sep 17 00:00:00 2001
From 492f8e02361c2461be3ae85cee55530e6f5da2be Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sat, 3 Aug 2013 19:53:48 +1000
Subject: [PATCH] Add Getter for Entity Invulnerability
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 97dfc54..1e51d4c 100644
index 6290da9..8f65054 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -559,6 +559,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -566,6 +566,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Spigot start
private final Spigot spigot = new Spigot()
{

8
CraftBukkit-Patches/0053-Particle-API.patch
View File

@ -1,4 +1,4 @@
From bbbf61ebd7ba02c32dc530777481c57547952769 Mon Sep 17 00:00:00 2001
From f7d1c59ee398f6740c96349acd5b41723c29c6a0 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -19,10 +19,10 @@ index 7de0de5..13f9e9d 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 6d94f48..5b18562 100644
index d132f1a..8f2ec20 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -847,28 +847,18 @@ public class CraftWorld implements World {
@@ -864,28 +864,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@ -60,7 +60,7 @@ index 6d94f48..5b18562 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1489,6 +1479,70 @@ public class CraftWorld implements World {
@@ -1516,6 +1506,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch
View File

@ -1,4 +1,4 @@
From 7ac2851b3697a50a91c97ea1dfb5f964d7eda786 Mon Sep 17 00:00:00 2001
From 5cf8af27e4ce431e97368d6443355adb429c059f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Improve AutoSave Mechanism
@ -60,10 +60,10 @@ index dfe3305..bd2837c 100644
SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5b18562..c9950d4 100644
index 8f2ec20..bb0268e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -751,12 +751,17 @@ public class CraftWorld implements World {
@@ -768,12 +768,17 @@ public class CraftWorld implements World {
}
public void save() {

6
CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch
View File

@ -1,4 +1,4 @@
From 9f7507e76b323384793e79189c84f19d5ee1c8fc Mon Sep 17 00:00:00 2001
From e52c5ab7c27d3bb054750dc1d07ca6bca864db9d Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -40,10 +40,10 @@ index 35a0bdc..e507302 100644
// this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dc, SoundCategory.d, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c9950d4..1ae82e7 100644
index bb0268e..80be0b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1548,6 +1548,22 @@ public class CraftWorld implements World {
@@ -1575,6 +1575,22 @@ public class CraftWorld implements World {
{
CraftWorld.this.playEffect( location, effect, 0 );
}

6
CraftBukkit-Patches/0111-Cross-World-Entity-Teleportation.patch
View File

@ -1,4 +1,4 @@
From 8dcb680f3c7620089b92fe0f47f20cb6321d7b7b Mon Sep 17 00:00:00 2001
From a1e22855914ea5e8402a720e6f895971199d756f Mon Sep 17 00:00:00 2001
From: Andrew Krieger <Slizyboy@hotmail.com>
Date: Tue, 24 Dec 2013 07:55:23 -0800
Subject: [PATCH] Cross World Entity Teleportation
@ -6,10 +6,10 @@ Subject: [PATCH] Cross World Entity Teleportation
Use Entity.teleportTo for cross-world teleportation in CraftEntity.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 1e51d4c..9a1c9f0 100644
index 8f65054..f80ac2c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -236,7 +236,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -243,7 +243,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// If this entity is riding another entity, we must dismount before teleporting.
entity.stopRiding();

6
CraftBukkit-Patches/0120-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View File

@ -1,4 +1,4 @@
From 3f5ed9251204c045f3e95dc1f70df0e73c1bfb10 Mon Sep 17 00:00:00 2001
From c500eacb08ec83135f9599519cfc0c6eea129a2e Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
@ -26,10 +26,10 @@ index 06ace47..f74d1b9 100644
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1ae82e7..b06f167 100644
index 80be0b1..e0b1c0c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1126,6 +1126,12 @@ public class CraftWorld implements World {
@@ -1153,6 +1153,12 @@ public class CraftWorld implements World {
}
if (entity != null) {

6
CraftBukkit-Patches/0136-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View File

@ -1,11 +1,11 @@
From 6f0d6235a3d51a857f8e2c59b96af9e196dbaa02 Mon Sep 17 00:00:00 2001
From 218a2ff7f819369481e1cbcd2d6cc2cc0926f4c0 Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:35:16 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index dcb9252..eaaa6a1 100644
index 3a2d0d8..22cc267 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -217,6 +217,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
@ -118,7 +118,7 @@ index dcb9252..eaaa6a1 100644
DISPLAY.NBT,
REPAIR.NBT,
ENCHANTMENTS.NBT,
@@ -957,6 +993,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -958,6 +994,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
// Spigot start
private final Spigot spigot = new Spigot()
{