Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-06-29 00:04:50 +02:00
Code Issues Projects Releases Wiki Activity

Rebuild patches

Browse Source
This commit is contained in:
md_5 2016-03-19 14:46:10 +11:00 committed by Zach Brown
parent 7c7f8b83ab
commit f368e2543d
6 changed files with 29 additions and 29 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 c7da54bf804914050256224cc75b4cb98a1dc4c6 Mon Sep 17 00:00:00 2001
From 6a7d6bd4e8e3175db58638c137135ed21d50fefa 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 1e150d1..2d98a7d 100644
index 9d71de4..f59bdd3 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1187,6 +1187,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1189,6 +1189,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 a271da23123d6dfba277272b76329cb9fbb63c38 Mon Sep 17 00:00:00 2001
From 839fc96a5f387bb4d5e17f916df25b60e42f20a5 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 2d98a7d..eb24544 100644
index f59bdd3..d088c3c 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1232,6 +1232,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1234,6 +1234,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
{
throw new UnsupportedOperationException( "Not supported yet." );
}

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

@ -1,4 +1,4 @@
From 49e75481d06159520ed6f324b3850419ec100811 Mon Sep 17 00:00:00 2001
From 5de73dd3d1df8ba2273c6b4192833ce7ffe5f0de 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
@ -26,7 +26,7 @@ index 12589d6..1d2f580 100644
public int a(Random random) {
return 1;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 750a5d9..73caf4e 100644
index 7004b58..6e3bcd7 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -620,6 +620,7 @@ public abstract class EntityLiving extends Entity {
@ -106,7 +106,7 @@ index e548d00..c73f0ef 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 fb84060..69875c9 100644
index 0dcdeab..dfe58c6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -169,6 +169,7 @@ public class CraftWorld implements World {
@ -122,7 +122,7 @@ index fb84060..69875c9 100644
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
+ org.spigotmc.AsyncCatcher.catchOp( "chunk unload"); // Spigot
if (safe && isChunkInUse(x, z)) {
if (isChunkInUse(x, z)) {
return false;
}
@@ -261,6 +263,7 @@ public class CraftWorld implements World {

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

@ -1,4 +1,4 @@
From 46ed743dcc7133a7b9572f224f455a0aa3bb3898 Mon Sep 17 00:00:00 2001
From bb377d35a2ce39ec624b3e9c3761c28c46fc9367 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
@ -124,7 +124,7 @@ index 9c17951..db78855 100644
public boolean aa() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e81a958..6e125e7 100644
index 6c81511..c1d4fb4 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -24,6 +24,7 @@ import org.bukkit.block.BlockFace;
@ -160,7 +160,7 @@ index e81a958..6e125e7 100644
public void recalcPosition() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 73caf4e..aca2c60 100644
index 6e3bcd7..ff20c9b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -24,6 +24,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@ -172,7 +172,7 @@ index 73caf4e..aca2c60 100644
public abstract class EntityLiving extends Entity {
private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
@@ -1675,6 +1677,7 @@ public abstract class EntityLiving extends Entity {
@@ -1680,6 +1682,7 @@ public abstract class EntityLiving extends Entity {
}
public void m() {
@ -180,7 +180,7 @@ index 73caf4e..aca2c60 100644
super.m();
this.cu();
if (!this.world.isClientSide) {
@@ -1747,7 +1750,9 @@ public abstract class EntityLiving extends Entity {
@@ -1752,7 +1755,9 @@ public abstract class EntityLiving extends Entity {
}
}
@ -190,7 +190,7 @@ index 73caf4e..aca2c60 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -1817,6 +1822,7 @@ public abstract class EntityLiving extends Entity {
@@ -1822,6 +1827,7 @@ public abstract class EntityLiving extends Entity {
this.bo = 0;
}
@ -198,7 +198,7 @@ index 73caf4e..aca2c60 100644
}
protected float h(float f, float f1) {
@@ -1881,6 +1887,7 @@ public abstract class EntityLiving extends Entity {
@@ -1886,6 +1892,7 @@ public abstract class EntityLiving extends Entity {
}
this.world.methodProfiler.a("ai");
@ -206,7 +206,7 @@ index 73caf4e..aca2c60 100644
if (this.cf()) {
this.bc = false;
this.bd = 0.0F;
@@ -1891,6 +1898,7 @@ public abstract class EntityLiving extends Entity {
@@ -1896,6 +1903,7 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.methodProfiler.b();
}
@ -214,7 +214,7 @@ index 73caf4e..aca2c60 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("jump");
@@ -1913,10 +1921,14 @@ public abstract class EntityLiving extends Entity {
@@ -1918,10 +1926,14 @@ public abstract class EntityLiving extends Entity {
this.be *= 0.98F;
this.bf *= 0.9F;
this.r();
@ -586,7 +586,7 @@ 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 69875c9..d132f1a 100644
index dfe58c6..e0e469d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -274,7 +274,9 @@ public class CraftWorld implements World {

8
CraftBukkit-Patches/0035-Player-Collision-API.patch
View File

@ -1,11 +1,11 @@
From b4fc682655ad6d28c1c0a18306244a6e6daa8bf3 Mon Sep 17 00:00:00 2001
From 5cb4c77361fa3df82d795a16680348b0b7a0b10d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index f0a757a..41619c1 100644
index 74bf367..45c4ef3 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -377,6 +377,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -25,10 +25,10 @@ index f0a757a..41619c1 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 96a0571..7a0f06a 100644
index 6fabefa..0cf1b90 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1969,7 +1969,7 @@ public abstract class EntityLiving extends Entity {
@@ -1974,7 +1974,7 @@ public abstract class EntityLiving extends Entity {
protected void cn() {
List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this));

10
CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch
View File

@ -1,4 +1,4 @@
From 27cef0d51daf007d8d142833a8ff15c9c2186581 Mon Sep 17 00:00:00 2001
From 65b40359420e0895ba245c0a7645e1fccdef63e0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 31 Jan 2014 11:18:34 -0500
Subject: [PATCH] Cap Entity Collisions
@ -7,7 +7,7 @@ Limit a single entity to colliding a max of configurable times per tick.
This will alleviate issues where living entities are hoarded in 1x1 pens.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a782867..c982151 100644
index b723b9b..0b0ff64 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener {
@ -19,10 +19,10 @@ index a782867..c982151 100644
public Entity(World world) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7a0f06a..89b2eb0 100644
index 0cf1b90..8122cae 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1970,7 +1970,8 @@ public abstract class EntityLiving extends Entity {
@@ -1975,7 +1975,8 @@ public abstract class EntityLiving extends Entity {
List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this));
if (this.isInteractable() && !list.isEmpty()) { // Spigot: Add isInteractable() condition
@ -32,7 +32,7 @@ index 7a0f06a..89b2eb0 100644
Entity entity = (Entity) list.get(i);
// TODO better check now?
// CraftBukkit start - Only handle mob (non-player) collisions every other tick
@@ -1979,7 +1980,8 @@ public abstract class EntityLiving extends Entity {
@@ -1984,7 +1985,8 @@ public abstract class EntityLiving extends Entity {
}
// CraftBukkit end