spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2017-06-26 09:15:06 +10:00
parent b78586d1d4
commit 23b6354742
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0008-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From e489e588c6b5e30106c0195c4ec7cae2845a0756 Mon Sep 17 00:00:00 2001
From 2d69a5eda7ee3cf8e0e07d90b78f9b3125632772 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,10 +26,10 @@ index d33e4925c..7501a1a28 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 a71960a75..a65bc14b5 100644
index ab7797b9e..9b70914de 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -662,6 +662,7 @@ public abstract class EntityLiving extends Entity {
@@ -663,6 +663,7 @@ public abstract class EntityLiving extends Entity {
}
public void addEffect(MobEffect mobeffect) {

18
CraftBukkit-Patches/0010-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From ee11c9e79b430bc202581e261c2192027319ac4a Mon Sep 17 00:00:00 2001
From 0a568d124c4bc9a280204e19d4dfccfd54f786e9 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
@ -160,7 +160,7 @@ index 926bb7892..144046e78 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 a65bc14b5..6d2d4ed15 100644
index 9b70914de..2e88fddb4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -31,6 +31,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -172,7 +172,7 @@ index a65bc14b5..6d2d4ed15 100644
public abstract class EntityLiving extends Entity {
private static final Logger a = LogManager.getLogger();
@@ -1852,6 +1854,7 @@ public abstract class EntityLiving extends Entity {
@@ -1853,6 +1855,7 @@ public abstract class EntityLiving extends Entity {
}
public void B_() {
@ -180,7 +180,7 @@ index a65bc14b5..6d2d4ed15 100644
super.B_();
this.cI();
if (!this.world.isClientSide) {
@@ -1924,7 +1927,9 @@ public abstract class EntityLiving extends Entity {
@@ -1925,7 +1928,9 @@ public abstract class EntityLiving extends Entity {
}
}
@ -190,7 +190,7 @@ index a65bc14b5..6d2d4ed15 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -2001,6 +2006,7 @@ public abstract class EntityLiving extends Entity {
@@ -2002,6 +2007,7 @@ public abstract class EntityLiving extends Entity {
this.bq = 0;
}
@ -198,7 +198,7 @@ index a65bc14b5..6d2d4ed15 100644
}
protected float g(float f, float f1) {
@@ -2065,6 +2071,7 @@ public abstract class EntityLiving extends Entity {
@@ -2066,6 +2072,7 @@ public abstract class EntityLiving extends Entity {
}
this.world.methodProfiler.a("ai");
@ -206,7 +206,7 @@ index a65bc14b5..6d2d4ed15 100644
if (this.isFrozen()) {
this.bd = false;
this.be = 0.0F;
@@ -2075,6 +2082,7 @@ public abstract class EntityLiving extends Entity {
@@ -2076,6 +2083,7 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.methodProfiler.b();
}
@ -214,7 +214,7 @@ index a65bc14b5..6d2d4ed15 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("jump");
@@ -2097,10 +2105,14 @@ public abstract class EntityLiving extends Entity {
@@ -2098,10 +2106,14 @@ public abstract class EntityLiving extends Entity {
this.bg *= 0.98F;
this.bh *= 0.9F;
this.r();
@ -522,7 +522,7 @@ index c275348e4..c47c973ea 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 65881397d..a23205f59 100644
index a13089f92..d5ec65c02 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -282,10 +282,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {

10
CraftBukkit-Patches/0014-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From 0b3537285b8153291b6b7dff58a859846f9dfe5c Mon Sep 17 00:00:00 2001
From 4d434a47e5b5f5d7af29ddfbec694d763b955992 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -126,7 +126,7 @@ index f1f479623..48cdef5db 100644
this.datawatcher.register(EntityFireworks.FIREWORK_ITEM, ItemStack.a);
this.datawatcher.register(EntityFireworks.b, Integer.valueOf(0));
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 44f8aac35..14caa86a6 100644
index bc8cd1ae5..dfd9a81d6 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -140,6 +140,28 @@ public class EntityItem extends Entity {
@ -159,12 +159,12 @@ index 44f8aac35..14caa86a6 100644
// Spigot start
double radius = world.spigotConfig.itemMerge;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6d2d4ed15..bc2da3316 100644
index 2e88fddb4..27580a938 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -116,6 +116,13 @@ public abstract class EntityLiving extends Entity {
public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
@@ -117,6 +117,13 @@ public abstract class EntityLiving extends Entity {
public boolean collides = true;
public boolean canPickUpLoot;
// CraftBukkit end
+ // Spigot start
+ public void inactiveTick()

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

@ -1,11 +1,11 @@
From c3e8558cc41fb3f451f7c76f9d0c03e89956924d Mon Sep 17 00:00:00 2001
From f74dca0b8b53488eaafa975953cedb95fe6f0a17 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
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index f270960c3..a42d3c3b2 100644
index ee8f07fcc..5a76821ea 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -8,6 +8,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -16,7 +16,7 @@ index f270960c3..a42d3c3b2 100644
public EntityOcelot(World world) {
super(world);
@@ -236,7 +237,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -233,7 +234,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@Nullable
public GroupDataEntity prepare(DifficultyDamageScaler difficultydamagescaler, @Nullable GroupDataEntity groupdataentity) {
groupdataentity = super.prepare(difficultydamagescaler, groupdataentity);