mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge in changes.

Browse source
This commit is contained in:
md_5 2015-01-16 14:58:23 +11:00 committed by Zach Brown
parent c6b30147f0
commit bfc8900321
9 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 3d085f28590dfc86aec47a6412dbf6dabfcaafc8 Mon Sep 17 00:00:00 2001 From a9654381036acf78c53c250d77127e5e6523e212 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000 Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations Subject: [PATCH] Skeleton API Implementations
@ -25,10 +25,10 @@ index b4ad7d1..4c33f5a 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 066c681..3f134f9 100644 index dac2ad0..5ef7d97 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1372,4 +1372,14 @@ public class CraftWorld implements World { @@ -1345,4 +1345,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ); cps.queueUnload(chunk.locX, chunk.locZ);
} }
} }

8
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 43c975988e8da5b34cc1329bfee89f016ecf2ba5 Mon Sep 17 00:00:00 2001 From 8d555f255d398001002608e6c2217f2fa3fdde66 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100 Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching Subject: [PATCH] Async Operation Catching
@ -26,10 +26,10 @@ index 12e2b79..9a19752 100644
public int a(Random random) { public int a(Random random) {
return 1; return 1;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fe324a3..331d4de 100644 index 0d76a99..d2a0954 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -546,6 +546,7 @@ public abstract class EntityLiving extends Entity { @@ -549,6 +549,7 @@ public abstract class EntityLiving extends Entity {
} }
public void addEffect(MobEffect mobeffect) { public void addEffect(MobEffect mobeffect) {
@ -106,7 +106,7 @@ index 30b5fed..86be044 100644
// this.entityList.addAll(collection); // this.entityList.addAll(collection);
Iterator iterator = collection.iterator(); Iterator iterator = collection.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 486a828..a9ff641 100644 index 5ef7d97..faefbe7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -165,6 +165,7 @@ public class CraftWorld implements World { @@ -165,6 +165,7 @@ public class CraftWorld implements World {

22
CraftBukkit-Patches/0012-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 3d8df83ca8a3eff073f8728f36f5e2422bd8f920 Mon Sep 17 00:00:00 2001 From fe9d395a701fe1c0e369712a4b6e278c6fa861d0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500 Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings Subject: [PATCH] Spigot Timings
@ -171,11 +171,11 @@ index ccf6479..c699dd1 100644
private void recalcPosition() { private void recalcPosition() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 331d4de..2a05941 100644 index d2a0954..71e1e6e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -17,6 +17,8 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; @@ -20,6 +20,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.vehicle.VehicleExitEvent;
// CraftBukkit end // CraftBukkit end
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot +import org.bukkit.craftbukkit.SpigotTimings; // Spigot
@ -183,7 +183,7 @@ index 331d4de..2a05941 100644
public abstract class EntityLiving extends Entity { public abstract class EntityLiving extends Entity {
private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D"); private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
@@ -1394,6 +1396,7 @@ public abstract class EntityLiving extends Entity { @@ -1397,6 +1399,7 @@ public abstract class EntityLiving extends Entity {
} }
public void s_() { public void s_() {
@ -191,7 +191,7 @@ index 331d4de..2a05941 100644
super.s_(); super.s_();
if (!this.world.isStatic) { if (!this.world.isStatic) {
int i = this.bu(); int i = this.bu();
@@ -1432,7 +1435,9 @@ public abstract class EntityLiving extends Entity { @@ -1435,7 +1438,9 @@ public abstract class EntityLiving extends Entity {
} }
} }
@ -201,7 +201,7 @@ index 331d4de..2a05941 100644
double d0 = this.locX - this.lastX; double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ; double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1); float f = (float) (d0 * d0 + d1 * d1);
@@ -1497,6 +1502,7 @@ public abstract class EntityLiving extends Entity { @@ -1500,6 +1505,7 @@ public abstract class EntityLiving extends Entity {
this.world.methodProfiler.b(); this.world.methodProfiler.b();
this.aR += f2; this.aR += f2;
@ -209,7 +209,7 @@ index 331d4de..2a05941 100644
} }
protected float h(float f, float f1) { protected float h(float f, float f1) {
@@ -1561,6 +1567,7 @@ public abstract class EntityLiving extends Entity { @@ -1564,6 +1570,7 @@ public abstract class EntityLiving extends Entity {
} }
this.world.methodProfiler.a("ai"); this.world.methodProfiler.a("ai");
@ -217,7 +217,7 @@ index 331d4de..2a05941 100644
if (this.bC()) { if (this.bC()) {
this.aW = false; this.aW = false;
this.aX = 0.0F; this.aX = 0.0F;
@@ -1571,6 +1578,7 @@ public abstract class EntityLiving extends Entity { @@ -1574,6 +1581,7 @@ public abstract class EntityLiving extends Entity {
this.doTick(); this.doTick();
this.world.methodProfiler.b(); this.world.methodProfiler.b();
} }
@ -225,7 +225,7 @@ index 331d4de..2a05941 100644
this.world.methodProfiler.b(); this.world.methodProfiler.b();
this.world.methodProfiler.a("jump"); this.world.methodProfiler.a("jump");
@@ -1592,11 +1600,15 @@ public abstract class EntityLiving extends Entity { @@ -1595,11 +1603,15 @@ public abstract class EntityLiving extends Entity {
this.aX *= 0.98F; this.aX *= 0.98F;
this.aY *= 0.98F; this.aY *= 0.98F;
this.aZ *= 0.9F; this.aZ *= 0.9F;
@ -600,7 +600,7 @@ index 51e4489..5286c1e 100644
public Spigot spigot() public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a9ff641..3b660ff 100644 index faefbe7..8105872 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -255,9 +255,11 @@ public class CraftWorld implements World { @@ -255,9 +255,11 @@ public class CraftWorld implements World {

8
CraftBukkit-Patches/0015-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From 6c932294f59e279a29fc26b287e6b4b76f71ff53 Mon Sep 17 00:00:00 2001 From aaba206943acc0564bd4e4d406771a381836b411 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500 Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range Subject: [PATCH] Entity Activation Range
@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay. This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 05213eb..33709ce 100644 index c699dd1..9dcddb1 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -89,14 +89,14 @@ public abstract class Entity implements ICommandListener { @@ -89,14 +89,14 @@ public abstract class Entity implements ICommandListener {
@ -145,10 +145,10 @@ index 8357157..16400c3 100644
super(world); super(world);
this.a(0.25F, 0.25F); this.a(0.25F, 0.25F);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c7fb84b..6bb5428 100644 index 71e1e6e..1530f18 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -83,6 +83,13 @@ public abstract class EntityLiving extends Entity { @@ -86,6 +86,13 @@ public abstract class EntityLiving extends Entity {
public int maxAirTicks = 300; public int maxAirTicks = 300;
ArrayList<org.bukkit.inventory.ItemStack> drops = null; ArrayList<org.bukkit.inventory.ItemStack> drops = null;
// CraftBukkit end // CraftBukkit end

6
CraftBukkit-Patches/0037-Player-Collision-API.patch
View file

@ -1,4 +1,4 @@
From ff00b8a9c49a289d0cac4c8fb4119e61c2fd140b Mon Sep 17 00:00:00 2001 From 3037321cf7de8d37558eac71f49126224b543e5c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000 Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API Subject: [PATCH] Player Collision API
@ -25,10 +25,10 @@ index 7eb41e1..b65c225 100644
} }
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fc8517d..b231ee2 100644 index 1530f18..ece05ff 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1626,7 +1626,7 @@ public abstract class EntityLiving extends Entity { @@ -1629,7 +1629,7 @@ public abstract class EntityLiving extends Entity {
protected void bK() { protected void bK() {
List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D)); List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));

8
CraftBukkit-Patches/0061-Particle-API.patch
View file

@ -1,4 +1,4 @@
From 96b0a2e9d93bd34b4fb865fe9b1bd78fcc700609 Mon Sep 17 00:00:00 2001 From e431a0f2dcd20553f425270ce3600e5632bbbc89 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000 Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API Subject: [PATCH] Particle API
@ -19,10 +19,10 @@ index 7de0de5..13f9e9d 100644
datavalue = 0; datavalue = 0;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 50469b1..a57136c 100644 index 8105872..204acdb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -841,28 +841,18 @@ public class CraftWorld implements World { @@ -814,28 +814,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
} }
@ -60,7 +60,7 @@ index 50469b1..a57136c 100644
} }
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException { public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1380,6 +1370,70 @@ public class CraftWorld implements World { @@ -1353,6 +1343,70 @@ public class CraftWorld implements World {
// Spigot start // Spigot start
private final Spigot spigot = new Spigot() private final Spigot spigot = new Spigot()
{ {

8
CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch
View file

@ -1,4 +1,4 @@
From 901e9094f475719aa9c5f5fd691d85ed90d05130 Mon Sep 17 00:00:00 2001 From 153b505b0c565ec8e15bb719d8f74c4eadbfedd2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 31 Jan 2014 11:18:34 -0500 Date: Fri, 31 Jan 2014 11:18:34 -0500
Subject: [PATCH] Cap Entity Collisions Subject: [PATCH] Cap Entity Collisions
@ -19,10 +19,10 @@ index a1d51a8..25192f3 100644
if (entity.passenger != this && entity.vehicle != this) { if (entity.passenger != this && entity.vehicle != this) {
if (!entity.T && !this.T) { if (!entity.T && !this.T) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b231ee2..d954ce9 100644 index ece05ff..bcdf820 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1627,7 +1627,9 @@ public abstract class EntityLiving extends Entity { @@ -1630,7 +1630,9 @@ public abstract class EntityLiving extends Entity {
List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D)); List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
if (this.ad() && list != null && !list.isEmpty()) { // Spigot: Add this.ad() condition if (this.ad() && list != null && !list.isEmpty()) { // Spigot: Add this.ad() condition
@ -32,7 +32,7 @@ index b231ee2..d954ce9 100644
Entity entity = (Entity) list.get(i); Entity entity = (Entity) list.get(i);
// TODO better check now? // TODO better check now?
@@ -1638,9 +1640,12 @@ public abstract class EntityLiving extends Entity { @@ -1641,9 +1643,12 @@ public abstract class EntityLiving extends Entity {
// CraftBukkit end // CraftBukkit end
if (entity.ae()) { if (entity.ae()) {

6
CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From a7317451acf715a588f8e7d6585a8e6a74be66ad Mon Sep 17 00:00:00 2001 From 39372c7a5b1e310c1704d037a84d11188fbe607a Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com> From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400 Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API Subject: [PATCH] Implement Silenceable Lightning API
@ -39,10 +39,10 @@ index 5bda5d3..1bbce9b 100644
//this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5ec836d..2c5238e 100644 index 660fd07..f07d87d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1439,6 +1439,22 @@ public class CraftWorld implements World { @@ -1412,6 +1412,22 @@ public class CraftWorld implements World {
{ {
CraftWorld.this.playEffect( location, effect, 0 ); CraftWorld.this.playEffect( location, effect, 0 );
} }

6
CraftBukkit-Patches/0135-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View file

@ -1,4 +1,4 @@
From 9afa26819f0fe759f929a385f7cc31327e0a0b61 Mon Sep 17 00:00:00 2001 From 175d15493a98ca909ff64169a7fbde7bdfc2c793 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org> From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100 Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
@ -26,10 +26,10 @@ index a6b72d8..0f5d09b 100644
EntityOcelot entityocelot = new EntityOcelot(this.world); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 2c5238e..a03fa41 100644 index f07d87d..e06d2cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1111,6 +1111,12 @@ public class CraftWorld implements World { @@ -1084,6 +1084,12 @@ public class CraftWorld implements World {
} }
if (entity != null) { if (entity != null) {