Correct patches
This commit is contained in:
parent
9673aebba1
commit
1fee2081f1
|
@ -1,4 +1,4 @@
|
||||||
From 2296ebebccd5c2aa4de40146dc5df177da04acad Mon Sep 17 00:00:00 2001
|
From bdc5870e89f2c479df6e0f68daedc579cdc60179 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 28 Jul 2018 12:18:27 -0400
|
Date: Sat, 28 Jul 2018 12:18:27 -0400
|
||||||
Subject: [PATCH] Ignore Dead Entities in entityList iteration
|
Subject: [PATCH] Ignore Dead Entities in entityList iteration
|
||||||
|
@ -51,14 +51,13 @@ index 0c8a2ac90..21fae98c1 100644
|
||||||
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
|
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
|
||||||
list.add(t0);
|
list.add(t0);
|
||||||
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 4648a93b0..99abf7f9c 100644
|
index 4648a93b0..33b2dd3ff 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
|
||||||
@@ -122,7 +122,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -123,6 +123,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
public boolean dead;
|
|
||||||
public float D;
|
public float D;
|
||||||
public float E;
|
public float E;
|
||||||
- public float F;
|
public float F;
|
||||||
+ public boolean shouldBeRemoved; // Paper
|
+ public boolean shouldBeRemoved; // Paper
|
||||||
public float fallDistance;
|
public float fallDistance;
|
||||||
private float av;
|
private float av;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ccfeb7d5bd45b718398cc2c8109b25b5a8a8af38 Mon Sep 17 00:00:00 2001
|
From 9c821668fb448e021731f6a8975fc7aa7ba0d6b3 Mon Sep 17 00:00:00 2001
|
||||||
From: miclebrick <miclebrick@outlook.com>
|
From: miclebrick <miclebrick@outlook.com>
|
||||||
Date: Thu, 23 Aug 2018 11:45:32 -0400
|
Date: Thu, 23 Aug 2018 11:45:32 -0400
|
||||||
Subject: [PATCH] Optimize CraftBlockData Creation
|
Subject: [PATCH] Optimize CraftBlockData Creation
|
||||||
|
@ -90,5 +90,5 @@ index c1666a9ba..3c29abd52 100644
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 3465b81fb8e52e9e126ab9bb25eeaf5501b5db8b Mon Sep 17 00:00:00 2001
|
From b17b9f33e112e162732c793ab9b80c9866ef1574 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Thu, 23 Aug 2018 09:25:30 -0500
|
Date: Thu, 23 Aug 2018 09:25:30 -0500
|
||||||
Subject: [PATCH] Fix MC-124320
|
Subject: [PATCH] Fix MC-124320
|
||||||
|
@ -49,5 +49,5 @@ index a1033ce28..de2d99534 100644
|
||||||
if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
|
if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
|
||||||
// CraftBukkit start - Place event
|
// CraftBukkit start - Place event
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From b404af9e2429ef6ad5f66c1c700e280fa30682e2 Mon Sep 17 00:00:00 2001
|
From 1113a6d5a1c81e6041758825fb05bc029c6f6a1e Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 24 Aug 2018 08:18:42 -0500
|
Date: Fri, 24 Aug 2018 08:18:42 -0500
|
||||||
Subject: [PATCH] Slime Pathfinder Events
|
Subject: [PATCH] Slime Pathfinder Events
|
||||||
|
@ -166,5 +166,5 @@ index 00fbef360..6c11a5f8a 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 813ce11240c5780bc34e1e1a80d7828848a138cb Mon Sep 17 00:00:00 2001
|
From a1738861691ad2eccd94ca720625d5d9c0c2efa7 Mon Sep 17 00:00:00 2001
|
||||||
From: Byteflux <byte@byteflux.net>
|
From: Byteflux <byte@byteflux.net>
|
||||||
Date: Wed, 8 Aug 2018 16:33:21 -0600
|
Date: Wed, 8 Aug 2018 16:33:21 -0600
|
||||||
Subject: [PATCH] Configurable speed for water flowing over lava
|
Subject: [PATCH] Configurable speed for water flowing over lava
|
||||||
|
@ -64,5 +64,5 @@ index 44e00339f..b4616f259 100644
|
||||||
|
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 9fd5fca0c60c4f4a8db49680bedf51d26a9d46a5 Mon Sep 17 00:00:00 2001
|
From 62c92278b563576a27b238c40e223565f39efeb7 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 26 Aug 2018 20:49:50 -0400
|
Date: Sun, 26 Aug 2018 20:49:50 -0400
|
||||||
Subject: [PATCH] Optimize RegistryMaterials
|
Subject: [PATCH] Optimize RegistryMaterials
|
||||||
|
@ -34,5 +34,5 @@ index f291e05b2..860924f9b 100644
|
||||||
|
|
||||||
return this.d[random.nextInt(this.d.length)];
|
return this.d[random.nextInt(this.d.length)];
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 81def067fdd714521f4c34842ca8b5eadb860e0b Mon Sep 17 00:00:00 2001
|
From a4256b8bdf6b75d0545db4e1544496229224dea2 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 25 Aug 2018 19:56:51 -0500
|
Date: Sat, 25 Aug 2018 19:56:51 -0500
|
||||||
Subject: [PATCH] Add PhantomPreSpawnEvent
|
Subject: [PATCH] Add PhantomPreSpawnEvent
|
||||||
|
@ -86,5 +86,5 @@ index 9f9ee9239..2b9731369 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From dce76a0f98ccdcd0159b2091497e3afba404a4ef Mon Sep 17 00:00:00 2001
|
From 30ec7114a8cb387aee128127e7fd3ef6d3a37791 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 24 Aug 2018 11:50:26 -0500
|
Date: Fri, 24 Aug 2018 11:50:26 -0500
|
||||||
Subject: [PATCH] Add More Creeper API
|
Subject: [PATCH] Add More Creeper API
|
||||||
|
@ -74,5 +74,5 @@ index 2f2abb707..e54664661 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From b4216d70077ebc9773c56edb7a5c0e3658c4c1e1 Mon Sep 17 00:00:00 2001
|
From 44a65351bac4ad22a15c48592f476a6d0898536d Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Tue, 28 Aug 2018 23:04:15 -0400
|
Date: Tue, 28 Aug 2018 23:04:15 -0400
|
||||||
Subject: [PATCH] Inventory#removeItemAnySlot
|
Subject: [PATCH] Inventory#removeItemAnySlot
|
||||||
|
@ -57,5 +57,5 @@ index 3a2b57ae7..fe52f87d3 100644
|
||||||
// Drat! we don't have this type in the inventory
|
// Drat! we don't have this type in the inventory
|
||||||
if (first == -1) {
|
if (first == -1) {
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 5ed707772fcd0f0522c260292194b869021bd93d Mon Sep 17 00:00:00 2001
|
From 14359f3288febf452031977b00ddaabb87a29bfb Mon Sep 17 00:00:00 2001
|
||||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||||
Date: Sun, 2 Sep 2018 19:34:33 -0700
|
Date: Sun, 2 Sep 2018 19:34:33 -0700
|
||||||
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
|
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
|
||||||
|
@ -19,5 +19,5 @@ index e336813bd..a6f6046c6 100644
|
||||||
// If generate = false, but the chunk already exists, we will get this back.
|
// If generate = false, but the chunk already exists, we will get this back.
|
||||||
if (chunk instanceof ProtoChunkExtension) {
|
if (chunk instanceof ProtoChunkExtension) {
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 3ea3ceaa9c5e78e04925ad8da3bad86657ea8c92 Mon Sep 17 00:00:00 2001
|
From b3fc29ee0ac0e56b2a3267a9b3bcd9e7b3e05bb8 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Mon, 3 Sep 2018 18:20:03 -0500
|
Date: Mon, 3 Sep 2018 18:20:03 -0500
|
||||||
Subject: [PATCH] Add ray tracing methods to LivingEntity
|
Subject: [PATCH] Add ray tracing methods to LivingEntity
|
||||||
|
@ -60,5 +60,5 @@ index 29b23e30f..863802187 100644
|
||||||
return getLineOfSight(transparent, maxDistance, 2);
|
return getLineOfSight(transparent, maxDistance, 2);
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 07d91651d9146cb2b0f7ec854170bdd189d206b3 Mon Sep 17 00:00:00 2001
|
From 52b041c2f84f505573c7c5f7d19195ec05b50d94 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Tue, 4 Sep 2018 15:02:00 -0500
|
Date: Tue, 4 Sep 2018 15:02:00 -0500
|
||||||
Subject: [PATCH] Expose attack cooldown methods for Player
|
Subject: [PATCH] Expose attack cooldown methods for Player
|
||||||
|
@ -52,5 +52,5 @@ index 6ceb02200..d505af188 100644
|
||||||
private final Player.Spigot spigot = new Player.Spigot()
|
private final Player.Spigot spigot = new Player.Spigot()
|
||||||
{
|
{
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 2ad1d2512ac6cb016cdd66e1523ea117e0665599 Mon Sep 17 00:00:00 2001
|
From cbdfe763326cfd3b4cf02eedd82e10ffa0f841d4 Mon Sep 17 00:00:00 2001
|
||||||
From: Phoenix616 <mail@moep.tv>
|
From: Phoenix616 <mail@moep.tv>
|
||||||
Date: Tue, 21 Aug 2018 01:39:35 +0100
|
Date: Tue, 21 Aug 2018 01:39:35 +0100
|
||||||
Subject: [PATCH] Improve death events
|
Subject: [PATCH] Improve death events
|
||||||
|
@ -27,10 +27,10 @@ index 20db76abd..a148cd437 100644
|
||||||
int i = this.f ? 300 : 100;
|
int i = this.f ? 300 : 100;
|
||||||
|
|
||||||
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 2dfa7d251..03e0e9e26 100644
|
index 784520342..ef7f0213b 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
|
||||||
@@ -1459,6 +1459,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -1460,6 +1460,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ index 2dfa7d251..03e0e9e26 100644
|
||||||
public void a(Entity entity, int i, DamageSource damagesource) {
|
public void a(Entity entity, int i, DamageSource damagesource) {
|
||||||
if (entity instanceof EntityPlayer) {
|
if (entity instanceof EntityPlayer) {
|
||||||
CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
|
CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
|
||||||
@@ -2340,6 +2341,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -2341,6 +2342,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
this.fallDistance = 0.0F;
|
this.fallDistance = 0.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -380,5 +380,5 @@ index 50444ed94..46c05c398 100644
|
||||||
* Server methods
|
* Server methods
|
||||||
*/
|
*/
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 2434b85e839291d0b8e8a41c0455a1f1eaf62131 Mon Sep 17 00:00:00 2001
|
From d137ab38024fc169be984ba55ce7308b71b1c9e0 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 8 Sep 2018 18:43:31 -0500
|
Date: Sat, 8 Sep 2018 18:43:31 -0500
|
||||||
Subject: [PATCH] Allow chests to be placed with NBT data
|
Subject: [PATCH] Allow chests to be placed with NBT data
|
||||||
|
@ -30,5 +30,5 @@ index d606e2e4f..f9f9183da 100644
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 6645468cad7fa72316b3525dd7b8a65085317dac Mon Sep 17 00:00:00 2001
|
From 7d4f3b57d373db1da0661bd3b78e0a31a6d5d3f5 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 9 Sep 2018 13:30:00 -0400
|
Date: Sun, 9 Sep 2018 13:30:00 -0400
|
||||||
Subject: [PATCH] Mob Pathfinding API
|
Subject: [PATCH] Mob Pathfinding API
|
||||||
|
@ -242,5 +242,5 @@ index 5bf1cd06f..53c2d154e 100644
|
||||||
public void setTarget(LivingEntity target) {
|
public void setTarget(LivingEntity target) {
|
||||||
EntityInsentient entity = getHandle();
|
EntityInsentient entity = getHandle();
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 4a85a3d33ce494a5f747f19e585b173cb466b892 Mon Sep 17 00:00:00 2001
|
From fb75e4cd5ba71bce95f55fa8dd92cc4daac2a5e3 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 10 Sep 2018 23:36:16 -0400
|
Date: Mon, 10 Sep 2018 23:36:16 -0400
|
||||||
Subject: [PATCH] Prevent chunk loading from Fluid Flowing
|
Subject: [PATCH] Prevent chunk loading from Fluid Flowing
|
||||||
|
@ -75,5 +75,5 @@ index c76fa0b4b..5f1514360 100644
|
||||||
Fluid fluid = (Fluid) pair.getSecond();
|
Fluid fluid = (Fluid) pair.getSecond();
|
||||||
Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1);
|
Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1);
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 9e027a8f92c1ba05ac21926a6abccceffd528577 Mon Sep 17 00:00:00 2001
|
From f3dcf97ec318940d16723ec6476c99c25cccc900 Mon Sep 17 00:00:00 2001
|
||||||
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
||||||
Date: Wed, 12 Sep 2018 18:53:55 +0300
|
Date: Wed, 12 Sep 2018 18:53:55 +0300
|
||||||
Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
|
Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
|
||||||
|
@ -432,5 +432,5 @@ index 9435136cc..9ced2abbb 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 161ab7a647cd41cd92bbcac2f1ced445043771a2 Mon Sep 17 00:00:00 2001
|
From 9d479f6c4d19fba75d8c7bf48654a9a6b612ccb5 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 10 Sep 2018 23:56:36 -0400
|
Date: Mon, 10 Sep 2018 23:56:36 -0400
|
||||||
Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
|
Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
|
||||||
|
@ -95,5 +95,5 @@ index 79ded224c..cfab578df 100644
|
||||||
@Override
|
@Override
|
||||||
public Fluid getFluid(BlockPosition blockposition) {
|
public Fluid getFluid(BlockPosition blockposition) {
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 51e5d0ca514e9ffc7f247926a95b6b14d263fbda Mon Sep 17 00:00:00 2001
|
From 8501c67f7e74dbed972e7f0219a545e6651d9509 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 12 Sep 2018 21:12:57 -0400
|
Date: Wed, 12 Sep 2018 21:12:57 -0400
|
||||||
Subject: [PATCH] Prevent mob spawning from loading/generating chunks
|
Subject: [PATCH] Prevent mob spawning from loading/generating chunks
|
||||||
|
@ -31,5 +31,5 @@ index e5695c760..696293132 100644
|
||||||
|
|
||||||
if (Objects.equals(chunkcoordintpair, chunk.getPos())) {
|
if (Objects.equals(chunkcoordintpair, chunk.getPos())) {
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 1f668d899ae49687568d601970c078165abaf3a7 Mon Sep 17 00:00:00 2001
|
From 1140ca688cc8290a2019ce551b33f13406876102 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 12 Sep 2018 21:47:01 -0400
|
Date: Wed, 12 Sep 2018 21:47:01 -0400
|
||||||
Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
|
Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
|
||||||
|
@ -67,5 +67,5 @@ index 9a839d654..72eb669c5 100644
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From cc661371925e5db06d8e2ec448589b026158e786 Mon Sep 17 00:00:00 2001
|
From f3bbdb4728c9e9042924d0de04503b83514dc1da Mon Sep 17 00:00:00 2001
|
||||||
From: Tassu <git@tassu.me>
|
From: Tassu <git@tassu.me>
|
||||||
Date: Thu, 13 Sep 2018 08:45:21 +0300
|
Date: Thu, 13 Sep 2018 08:45:21 +0300
|
||||||
Subject: [PATCH] Implement furnace cook speed multiplier API
|
Subject: [PATCH] Implement furnace cook speed multiplier API
|
||||||
|
@ -80,5 +80,5 @@ index 9cc67915c..1ce10ea04 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 9dc7c60b583e36eca521c9b2f2249d02757527e7 Mon Sep 17 00:00:00 2001
|
From bf647b1da689c8a5771ff0a90a1c32df5786f8a5 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 17 Sep 2018 23:05:31 -0400
|
Date: Mon, 17 Sep 2018 23:05:31 -0400
|
||||||
Subject: [PATCH] Support Overriding World Seeds
|
Subject: [PATCH] Support Overriding World Seeds
|
||||||
|
@ -98,5 +98,5 @@ index 7b204d584..cf657167d 100644
|
||||||
if (parsedSettings.isJsonObject()) {
|
if (parsedSettings.isJsonObject()) {
|
||||||
worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject());
|
worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject());
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 671fc3ee15d2bc2981d459dbd9102019854cf27f Mon Sep 17 00:00:00 2001
|
From 1a29717bd155df28147f7ac0406e490cef450fe6 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 17 Sep 2018 23:37:31 -0400
|
Date: Mon, 17 Sep 2018 23:37:31 -0400
|
||||||
Subject: [PATCH] Optimize Server World Map
|
Subject: [PATCH] Optimize Server World Map
|
||||||
|
@ -247,5 +247,5 @@ index 27af4398c..e6054dddb 100644
|
||||||
DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
|
DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 35d7db6066c6959469ddd243c50a11c095ee7460 Mon Sep 17 00:00:00 2001
|
From e0ee892fc74c4b2d4cfb5c5b4210fd886f6f43a4 Mon Sep 17 00:00:00 2001
|
||||||
From: Phoenix616 <mail@moep.tv>
|
From: Phoenix616 <mail@moep.tv>
|
||||||
Date: Tue, 18 Sep 2018 23:53:23 +0100
|
Date: Tue, 18 Sep 2018 23:53:23 +0100
|
||||||
Subject: [PATCH] PreSpawnerSpawnEvent
|
Subject: [PATCH] PreSpawnerSpawnEvent
|
||||||
|
@ -28,5 +28,5 @@ index bca0e3a2e..96080b6c7 100644
|
||||||
if (!event.callEvent()) {
|
if (!event.callEvent()) {
|
||||||
flag = true;
|
flag = true;
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From e5eeb481db23231a6285d2c5a467ed942ab37753 Mon Sep 17 00:00:00 2001
|
From 248b955d09eb8538778eeca3fea048b66cb5a272 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Sat, 22 Sep 2018 15:56:59 -0400
|
Date: Sat, 22 Sep 2018 15:56:59 -0400
|
||||||
Subject: [PATCH] Catch JsonParseException in Entity and TE names
|
Subject: [PATCH] Catch JsonParseException in Entity and TE names
|
||||||
|
@ -26,10 +26,10 @@ index 4b7aefb7a..9e568d5d1 100644
|
||||||
|
|
||||||
if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
|
if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
|
||||||
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 03e0e9e26..c9aa5ae16 100644
|
index ef7f0213b..b4fd3f0dc 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
|
||||||
@@ -1638,7 +1638,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -1639,7 +1639,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
this.setPosition(this.locX, this.locY, this.locZ);
|
this.setPosition(this.locX, this.locY, this.locZ);
|
||||||
this.setYawPitch(this.yaw, this.pitch);
|
this.setYawPitch(this.yaw, this.pitch);
|
||||||
if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
|
if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
|
||||||
|
@ -89,5 +89,5 @@ index 3590b4e31..ea7d5a430 100644
|
||||||
|
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 6f94b19a248156022f89d6c5f31cf44c3320db79 Mon Sep 17 00:00:00 2001
|
From 9da36883e7b0f7773037d03e6d88a7bdd48077de Mon Sep 17 00:00:00 2001
|
||||||
From: Brokkonaut <hannos17@gmx.de>
|
From: Brokkonaut <hannos17@gmx.de>
|
||||||
Date: Tue, 25 Sep 2018 06:53:43 +0200
|
Date: Tue, 25 Sep 2018 06:53:43 +0200
|
||||||
Subject: [PATCH] Avoid dimension id collisions
|
Subject: [PATCH] Avoid dimension id collisions
|
||||||
|
@ -21,5 +21,5 @@ index cf657167d..15756014a 100644
|
||||||
dimension++;
|
dimension++;
|
||||||
break;
|
break;
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 896d92d0fd299a8a6ddd9dfb2c30e100b259e696 Mon Sep 17 00:00:00 2001
|
From f854ee1020f64f5ff8421345164f046ae34515f7 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sun, 23 Sep 2018 20:59:53 -0500
|
Date: Sun, 23 Sep 2018 20:59:53 -0500
|
||||||
Subject: [PATCH] Honor EntityAgeable.ageLock
|
Subject: [PATCH] Honor EntityAgeable.ageLock
|
||||||
|
@ -17,5 +17,5 @@ index da9740a99..e87754ef3 100644
|
||||||
int k = j;
|
int k = j;
|
||||||
|
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 33dac55b42040a29364c8c5662d3faa1173995b6 Mon Sep 17 00:00:00 2001
|
From e30eb9d3a23f88e29d5b333c8d40e1b33af49a04 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 27 Sep 2018 00:08:31 -0400
|
Date: Thu, 27 Sep 2018 00:08:31 -0400
|
||||||
Subject: [PATCH] Ignore Dimension NBT field in Entity data
|
Subject: [PATCH] Ignore Dimension NBT field in Entity data
|
||||||
|
@ -14,10 +14,10 @@ DimensionManager set to the world it is being placed into.
|
||||||
This fixes corrupt entities breaking chunk saving in custom worlds.
|
This fixes corrupt entities breaking chunk saving in custom worlds.
|
||||||
|
|
||||||
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 c9aa5ae16..464e1d2d9 100644
|
index b4fd3f0dc..57bc805cf 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
|
||||||
@@ -1623,7 +1623,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -1624,7 +1624,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
this.setAirTicks(nbttagcompound.getShort("Air"));
|
this.setAirTicks(nbttagcompound.getShort("Air"));
|
||||||
this.onGround = nbttagcompound.getBoolean("OnGround");
|
this.onGround = nbttagcompound.getBoolean("OnGround");
|
||||||
if (nbttagcompound.hasKey("Dimension")) {
|
if (nbttagcompound.hasKey("Dimension")) {
|
||||||
|
@ -27,5 +27,5 @@ index c9aa5ae16..464e1d2d9 100644
|
||||||
|
|
||||||
this.invulnerable = nbttagcompound.getBoolean("Invulnerable");
|
this.invulnerable = nbttagcompound.getBoolean("Invulnerable");
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 4d4c344c62dfec481ac95bfa8bd8cc4eed268968 Mon Sep 17 00:00:00 2001
|
From 9ef48356f0243ca78e894883868a0d1110109814 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 28 Sep 2018 22:27:33 -0400
|
Date: Fri, 28 Sep 2018 22:27:33 -0400
|
||||||
Subject: [PATCH] Don't recheck type after setting a block
|
Subject: [PATCH] Don't recheck type after setting a block
|
||||||
|
@ -29,5 +29,5 @@ index 21fae98c1..98ca253bd 100644
|
||||||
} else {
|
} else {
|
||||||
TileEntity tileentity;
|
TileEntity tileentity;
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From d7b7b457072fcdc2039703724fed4d51d6f1e032 Mon Sep 17 00:00:00 2001
|
From fb74e56df96985f7cfcac041d469ed6b5e772802 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Tue, 2 Oct 2018 09:57:50 +0100
|
Date: Tue, 2 Oct 2018 09:57:50 +0100
|
||||||
Subject: [PATCH] Configurable connection throttle kick message
|
Subject: [PATCH] Configurable connection throttle kick message
|
||||||
|
@ -34,5 +34,5 @@ index da88978db..1dad79620 100644
|
||||||
this.b.close(chatmessage);
|
this.b.close(chatmessage);
|
||||||
return;
|
return;
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 7b3e2236c1a1703ead6a034951603590fdb0eb4b Mon Sep 17 00:00:00 2001
|
From 207fd4ba0653034af93915c508e005146da412d8 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach@zachbr.io>
|
From: Zach Brown <zach@zachbr.io>
|
||||||
Date: Wed, 3 Oct 2018 20:09:18 -0400
|
Date: Wed, 3 Oct 2018 20:09:18 -0400
|
||||||
Subject: [PATCH] Hook into CB plugin rewrites
|
Subject: [PATCH] Hook into CB plugin rewrites
|
||||||
|
@ -187,5 +187,5 @@ index 467b2d938..61f102355 100644
|
||||||
{
|
{
|
||||||
if ( owner.equals( "org/bukkit/Material" ) )
|
if ( owner.equals( "org/bukkit/Material" ) )
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From d937237c3e6b37fb71749d0648e38acd8cd15c13 Mon Sep 17 00:00:00 2001
|
From e634e12cf18446167d0fea0dca47a6e8454149b5 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 6 Oct 2018 21:47:44 -0500
|
Date: Sat, 6 Oct 2018 21:47:44 -0500
|
||||||
Subject: [PATCH] Allow setting the vex's summoner
|
Subject: [PATCH] Allow setting the vex's summoner
|
||||||
|
@ -32,5 +32,5 @@ index 169c951ec..2f7df3074 100644
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From b588ba389f00390b2f1972896804aeea504d07a7 Mon Sep 17 00:00:00 2001
|
From 3e91502baf7be5a076bd88cd31eb942dff11f9cc Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sun, 7 Oct 2018 00:54:21 -0500
|
Date: Sun, 7 Oct 2018 00:54:21 -0500
|
||||||
Subject: [PATCH] Add sun related API
|
Subject: [PATCH] Add sun related API
|
||||||
|
@ -61,5 +61,5 @@ index 53c2d154e..40a429942 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From d79f4a77c0c8fab17a1565c668a1f54cb7b1e924 Mon Sep 17 00:00:00 2001
|
From b273ab1cacc5e16fe3018d2fd7f03472e47aad87 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Wed, 10 Oct 2018 21:22:44 -0500
|
Date: Wed, 10 Oct 2018 21:22:44 -0500
|
||||||
Subject: [PATCH] Check Drowned for Villager Aggression Config
|
Subject: [PATCH] Check Drowned for Villager Aggression Config
|
||||||
|
@ -18,5 +18,5 @@ index 10957c877..449fbee60 100644
|
||||||
this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bz));
|
this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bz));
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From b59ff4e2634c197677db8abddd8a88ec9aee3216 Mon Sep 17 00:00:00 2001
|
From 7f5c9f90530b54d5c0d40e8cc04fbf093d148d38 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 12 Oct 2018 01:37:22 -0500
|
Date: Fri, 12 Oct 2018 01:37:22 -0500
|
||||||
Subject: [PATCH] Here's Johnny!
|
Subject: [PATCH] Here's Johnny!
|
||||||
|
@ -37,5 +37,5 @@ index 951d47929..5ff957ced 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 8ca9aa840baa8b73a690492a4e7f8eabbd84459e Mon Sep 17 00:00:00 2001
|
From 879fdf1d02a1a264a30f2e64493132cc94244fe6 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 29 Sep 2018 16:08:23 -0500
|
Date: Sat, 29 Sep 2018 16:08:23 -0500
|
||||||
Subject: [PATCH] Turtle API
|
Subject: [PATCH] Turtle API
|
||||||
|
@ -154,5 +154,5 @@ index 123a2c75c..8edcf7af6 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 29e5e87a0972c9cc533998e6e29763b68a59ca90 Mon Sep 17 00:00:00 2001
|
From 9987394561bd9b42c7871e0b7e79e9b42132bc4b Mon Sep 17 00:00:00 2001
|
||||||
From: Trigary <trigary0@gmail.com>
|
From: Trigary <trigary0@gmail.com>
|
||||||
Date: Fri, 14 Sep 2018 17:42:08 +0200
|
Date: Fri, 14 Sep 2018 17:42:08 +0200
|
||||||
Subject: [PATCH] Limit lightning strike effect distance
|
Subject: [PATCH] Limit lightning strike effect distance
|
||||||
|
@ -82,5 +82,5 @@ index ffa5a0bee..6d8fb1290 100644
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From b531670a0b37bb42392bcde1581b8d327d017e57 Mon Sep 17 00:00:00 2001
|
From c966d1ff3fc64dbd44db9bbc6280fddc32a4971a Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 17 Oct 2018 19:17:27 -0400
|
Date: Wed, 17 Oct 2018 19:17:27 -0400
|
||||||
Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
|
Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
|
||||||
|
@ -38,5 +38,5 @@ index c19828ed5..7deeaa083 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 04b270bf65e102f17b5caed5f4559b0d71b33dac Mon Sep 17 00:00:00 2001
|
From 13951c4952e0cd14e77a5e99905445ed782f8b08 Mon Sep 17 00:00:00 2001
|
||||||
From: Caleb Bassham <caleb.bassham@gmail.com>
|
From: Caleb Bassham <caleb.bassham@gmail.com>
|
||||||
Date: Fri, 28 Sep 2018 02:32:19 -0500
|
Date: Fri, 28 Sep 2018 02:32:19 -0500
|
||||||
Subject: [PATCH] Call player spectator target events
|
Subject: [PATCH] Call player spectator target events
|
||||||
|
@ -59,5 +59,5 @@ index 332515128..8d18c51c9 100644
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 8b7d846baf05001d3dc4f47696a5bfad03ffb815 Mon Sep 17 00:00:00 2001
|
From 92c879398427489da077ff8c40ac1a0628e5b947 Mon Sep 17 00:00:00 2001
|
||||||
From: Andrew Steinborn <git@steinborn.me>
|
From: Andrew Steinborn <git@steinborn.me>
|
||||||
Date: Mon, 8 Oct 2018 14:36:14 -0400
|
Date: Mon, 8 Oct 2018 14:36:14 -0400
|
||||||
Subject: [PATCH] Add Velocity IP Forwarding Support
|
Subject: [PATCH] Add Velocity IP Forwarding Support
|
||||||
|
@ -278,5 +278,5 @@ index ae74dc9e1..7eb230f1b 100644
|
||||||
public void a(PacketDataSerializer packetdataserializer) throws IOException {
|
public void a(PacketDataSerializer packetdataserializer) throws IOException {
|
||||||
this.a = packetdataserializer.i();
|
this.a = packetdataserializer.i();
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 81f186827ee2be062515c87b8479ee7c0b3f815b Mon Sep 17 00:00:00 2001
|
From cccc6bd2b7e841f7b834f73cfb56baee1fc143db Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 12 Oct 2018 14:10:46 -0500
|
Date: Fri, 12 Oct 2018 14:10:46 -0500
|
||||||
Subject: [PATCH] Add more Witch API
|
Subject: [PATCH] Add more Witch API
|
||||||
|
@ -145,5 +145,5 @@ index 49e0f2206..d157d195d 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 9e908a08ca6718a04ffe3655804b6458527b8ce4 Mon Sep 17 00:00:00 2001
|
From a352d17e29b7cbf6504af209a19d50056aae1c59 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 19 Oct 2018 19:38:45 -0500
|
Date: Fri, 19 Oct 2018 19:38:45 -0500
|
||||||
Subject: [PATCH] Fix MC-93764
|
Subject: [PATCH] Fix MC-93764
|
||||||
|
@ -18,5 +18,5 @@ index c25be1642..b323df98e 100644
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 6a3e3c116ef3c503203adc5a18c85c637f57729c Mon Sep 17 00:00:00 2001
|
From aa5ca3c61f40bcade5ce13c3312c921dc374e0cb Mon Sep 17 00:00:00 2001
|
||||||
From: Gabriele C <sgdc3.mail@gmail.com>
|
From: Gabriele C <sgdc3.mail@gmail.com>
|
||||||
Date: Mon, 22 Oct 2018 17:34:10 +0200
|
Date: Mon, 22 Oct 2018 17:34:10 +0200
|
||||||
Subject: [PATCH] Add option to prevent players from moving into unloaded
|
Subject: [PATCH] Add option to prevent players from moving into unloaded
|
||||||
|
@ -64,5 +64,5 @@ index e59037211..16a7aba49 100644
|
||||||
float f2 = this.player.isGliding() ? 300.0F : 100.0F;
|
float f2 = this.player.isGliding() ? 300.0F : 100.0F;
|
||||||
|
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
From ff8fcdaf3f1adc48192221444997caa6ec33574c Mon Sep 17 00:00:00 2001
|
From 9537f5342de2b00331c786c63c228df41139f040 Mon Sep 17 00:00:00 2001
|
||||||
From: GreenMeanie <GreenMeanieMC@gmail.com>
|
From: GreenMeanie <GreenMeanieMC@gmail.com>
|
||||||
Date: Sat, 20 Oct 2018 22:34:02 -0400
|
Date: Sat, 20 Oct 2018 22:34:02 -0400
|
||||||
Subject: [PATCH] Reset players airTicks on respawn
|
Subject: [PATCH] Reset players airTicks on respawn
|
||||||
|
|
||||||
|
|
||||||
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 464e1d2d9..4bdeba399 100644
|
index 57bc805cf..0871e185e 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
|
||||||
@@ -2253,7 +2253,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -2254,7 +2254,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,5 +30,5 @@ index 8d18c51c9..c71e4dfbe 100644
|
||||||
this.fallDistance = 0;
|
this.fallDistance = 0;
|
||||||
this.foodData = new FoodMetaData(this);
|
this.foodData = new FoodMetaData(this);
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ed6837e75e4cd01666c7a616ef7e2dd087dc6536 Mon Sep 17 00:00:00 2001
|
From 33d57b2ea7d5b38da914eff9837b7f2e3a276334 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach@zachbr.io>
|
From: Zach Brown <zach@zachbr.io>
|
||||||
Date: Tue, 23 Oct 2018 20:53:43 -0400
|
Date: Tue, 23 Oct 2018 20:53:43 -0400
|
||||||
Subject: [PATCH] Strip private area unicode characters from signs
|
Subject: [PATCH] Strip private area unicode characters from signs
|
||||||
|
@ -90,5 +90,5 @@ index 9de03a24c..4165c6d11 100644
|
||||||
|
|
||||||
public void a(int i, IChatBaseComponent ichatbasecomponent) {
|
public void a(int i, IChatBaseComponent ichatbasecomponent) {
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 3cfdf00b7cfe3250bc84a34afffaebe84929043e Mon Sep 17 00:00:00 2001
|
From 7fb8dc829440e11877869f2e78e8ee843607175a Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 23 Oct 2018 20:25:05 -0400
|
Date: Tue, 23 Oct 2018 20:25:05 -0400
|
||||||
Subject: [PATCH] Don't sleep after profile lookups if not needed
|
Subject: [PATCH] Don't sleep after profile lookups if not needed
|
||||||
|
@ -32,5 +32,5 @@ index 71e48e87b..23f1447cf 100644
|
||||||
try {
|
try {
|
||||||
Thread.sleep(DELAY_BETWEEN_PAGES);
|
Thread.sleep(DELAY_BETWEEN_PAGES);
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 47c19a59b47215cd29d1789020aa626fa841c681 Mon Sep 17 00:00:00 2001
|
From 452e2efbdb3a190077f42eadc2781afd0cc40d91 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 23 Oct 2018 23:14:38 -0400
|
Date: Tue, 23 Oct 2018 23:14:38 -0400
|
||||||
Subject: [PATCH] Use more reasonable thread count default for bootstrap
|
Subject: [PATCH] Use more reasonable thread count default for bootstrap
|
||||||
|
@ -18,5 +18,5 @@ index 706040212..d5d8f7eb8 100644
|
||||||
|
|
||||||
if (i <= 0) {
|
if (i <= 0) {
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From d158145e22e63dcaf1eec50e93de0a9a8b81f2b3 Mon Sep 17 00:00:00 2001
|
From fe308dbb2344b42c892c40e55d65bd1aa537ab70 Mon Sep 17 00:00:00 2001
|
||||||
From: MisterVector <whizkid3000@hotmail.com>
|
From: MisterVector <whizkid3000@hotmail.com>
|
||||||
Date: Thu, 1 Nov 2018 14:50:05 -0700
|
Date: Thu, 1 Nov 2018 14:50:05 -0700
|
||||||
Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
|
Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
|
||||||
|
@ -30,5 +30,5 @@ index f692da609..5bc8bd7cd 100644
|
||||||
iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
|
iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 5cf3baddf895999083a82dc77734d0298d5d542a Mon Sep 17 00:00:00 2001
|
From 2e1e98b95f70b8e125cdfe459d4796dab8b2d950 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 2 Nov 2018 23:11:51 -0400
|
Date: Fri, 2 Nov 2018 23:11:51 -0400
|
||||||
Subject: [PATCH] Optimize World Time Updates
|
Subject: [PATCH] Optimize World Time Updates
|
||||||
|
@ -41,5 +41,5 @@ index e6054dddb..e90cf0629 100644
|
||||||
|
|
||||||
// WorldServer worldserver; // CraftBukkit - dropped down
|
// WorldServer worldserver; // CraftBukkit - dropped down
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 6caf1aae5228cf7cac288de7e5e2a743cb1ddd5a Mon Sep 17 00:00:00 2001
|
From 6408115b7e41e63baf5f0a1b72bca3c3fcbd1a6c Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Mon, 5 Nov 2018 04:23:51 +0000
|
Date: Mon, 5 Nov 2018 04:23:51 +0000
|
||||||
Subject: [PATCH] Restore custom InventoryHolder support
|
Subject: [PATCH] Restore custom InventoryHolder support
|
||||||
|
@ -42,5 +42,5 @@ index 9957ed040..ae280dd40 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 47c534c81bcd0b82efbafdff594dbee5e5c2547e Mon Sep 17 00:00:00 2001
|
From 9800d07ce1ef4276485eed6ba5ed000d67f9058b Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 8 Nov 2018 21:33:09 -0500
|
Date: Thu, 8 Nov 2018 21:33:09 -0500
|
||||||
Subject: [PATCH] Use Vanilla Minecart Speeds
|
Subject: [PATCH] Use Vanilla Minecart Speeds
|
||||||
|
@ -23,5 +23,5 @@ index 6fc332dbf..828a8711d 100644
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 8f317e9ad1d4711329821c5c254cf41e31d3a86b Mon Sep 17 00:00:00 2001
|
From 39f31e8ab75732c18c0be72b744d5bbd902fe932 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Sat, 10 Nov 2018 05:15:21 +0000
|
Date: Sat, 10 Nov 2018 05:15:21 +0000
|
||||||
Subject: [PATCH] Fix SpongeAbsortEvent handling
|
Subject: [PATCH] Fix SpongeAbsortEvent handling
|
||||||
|
@ -37,5 +37,5 @@ index 4e281ce6d..6a64af71b 100644
|
||||||
}
|
}
|
||||||
world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag());
|
world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag());
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 14f33763163441956bf08dd3414a25d0f222afe3 Mon Sep 17 00:00:00 2001
|
From 6e981d061d798547c837377b0d62383d85e686d0 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Sun, 11 Nov 2018 21:01:09 +0000
|
Date: Sun, 11 Nov 2018 21:01:09 +0000
|
||||||
Subject: [PATCH] Don't allow digging into unloaded chunks
|
Subject: [PATCH] Don't allow digging into unloaded chunks
|
||||||
|
@ -21,5 +21,5 @@ index 16a7aba49..8d2b02894 100644
|
||||||
double d1 = this.player.locY - ((double) blockposition.getY() + 0.5D) + 1.5D;
|
double d1 = this.player.locY - ((double) blockposition.getY() + 0.5D) + 1.5D;
|
||||||
double d2 = this.player.locZ - ((double) blockposition.getZ() + 0.5D);
|
double d2 = this.player.locZ - ((double) blockposition.getZ() + 0.5D);
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 666bfc88b5bd606367c2be958ccffd57c0b25300 Mon Sep 17 00:00:00 2001
|
From b383c6d226402d5912e2f496b284530bc78d8a34 Mon Sep 17 00:00:00 2001
|
||||||
From: theosib <millerti@172.16.221.1>
|
From: theosib <millerti@172.16.221.1>
|
||||||
Date: Thu, 27 Sep 2018 01:43:35 -0600
|
Date: Thu, 27 Sep 2018 01:43:35 -0600
|
||||||
Subject: [PATCH] Optimize redstone algorithm
|
Subject: [PATCH] Optimize redstone algorithm
|
||||||
|
@ -1142,5 +1142,5 @@ index c917c39b9..17401ea28 100644
|
||||||
int i = 0;
|
int i = 0;
|
||||||
EnumDirection[] aenumdirection = World.a;
|
EnumDirection[] aenumdirection = World.a;
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From cba797992e47d77d2fa6ba776d3bead0800c43cd Mon Sep 17 00:00:00 2001
|
From 7573ce9b6d709ce865081c767fc853299f3b4c91 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Thu, 15 Nov 2018 13:38:37 +0000
|
Date: Thu, 15 Nov 2018 13:38:37 +0000
|
||||||
Subject: [PATCH] force entity dismount during teleportation
|
Subject: [PATCH] force entity dismount during teleportation
|
||||||
|
@ -20,10 +20,10 @@ this is going to be the best soultion all around.
|
||||||
Improvements/suggestions welcome!
|
Improvements/suggestions welcome!
|
||||||
|
|
||||||
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 4bdeba399..dec531ab7 100644
|
index 0871e185e..f945a2df4 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
|
||||||
@@ -1981,12 +1981,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -1982,12 +1982,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ index 4bdeba399..dec531ab7 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -2037,7 +2040,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -2038,7 +2041,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
return true; // CraftBukkit
|
return true; // CraftBukkit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ index 4bdeba399..dec531ab7 100644
|
||||||
if (entity.getVehicle() == this) {
|
if (entity.getVehicle() == this) {
|
||||||
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
|
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
|
||||||
} else {
|
} else {
|
||||||
@@ -2047,7 +2053,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -2048,7 +2054,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
|
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
|
||||||
VehicleExitEvent event = new VehicleExitEvent(
|
VehicleExitEvent event = new VehicleExitEvent(
|
||||||
(Vehicle) getBukkitEntity(),
|
(Vehicle) getBukkitEntity(),
|
||||||
|
@ -62,7 +62,7 @@ index 4bdeba399..dec531ab7 100644
|
||||||
);
|
);
|
||||||
Bukkit.getPluginManager().callEvent(event);
|
Bukkit.getPluginManager().callEvent(event);
|
||||||
CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
|
CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
|
||||||
@@ -2058,7 +2064,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -2059,7 +2065,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
// Spigot start
|
// Spigot start
|
||||||
|
@ -133,5 +133,5 @@ index c71e4dfbe..71ad35f71 100644
|
||||||
|
|
||||||
if (entity1 != entity && this.playerConnection != null) {
|
if (entity1 != entity && this.playerConnection != null) {
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From da0362d759be7bd323ea133f351c5de56dafccce Mon Sep 17 00:00:00 2001
|
From 104054cefe0ffe5a3c723099267c090f39d42589 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 16 Nov 2018 23:08:50 -0500
|
Date: Fri, 16 Nov 2018 23:08:50 -0500
|
||||||
Subject: [PATCH] Book Size Limits
|
Subject: [PATCH] Book Size Limits
|
||||||
|
@ -77,5 +77,5 @@ index 8d2b02894..15fb7ed60 100644
|
||||||
PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
|
PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
|
||||||
if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
|
if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From b1cb08688d24eb143d7b026617267c6d063d88c1 Mon Sep 17 00:00:00 2001
|
From 8c8dbe613903b931880b53f484a8c2289bfb103f Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Sun, 18 Nov 2018 19:49:56 +0000
|
Date: Sun, 18 Nov 2018 19:49:56 +0000
|
||||||
Subject: [PATCH] Make the default permission message configurable
|
Subject: [PATCH] Make the default permission message configurable
|
||||||
|
@ -45,5 +45,5 @@ index 15756014a..b05d7b0e8 100644
|
||||||
public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
|
public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
|
||||||
return createProfile(uuid, null);
|
return createProfile(uuid, null);
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 690ee0b9cbb926fcb9509eb8877402930a77a9d4 Mon Sep 17 00:00:00 2001
|
From 57c0ebf3ae124517042d272472fa6dde98d028c9 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sun, 7 Oct 2018 04:29:59 -0500
|
Date: Sun, 7 Oct 2018 04:29:59 -0500
|
||||||
Subject: [PATCH] Add more Zombie API
|
Subject: [PATCH] Add more Zombie API
|
||||||
|
@ -110,5 +110,5 @@ index c28ccd0d9..442befba8 100644
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.20.1
|
2.21.0
|
||||||
|
|
Loading…
Reference in New Issue