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

[Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
8ab814cd Add getFacing method to get the current cardinal direction an entity is facing.

CraftBukkit Changes:
ee5efeb0 Add getFacing method to get the current cardinal direction an entity is facing.

Spigot Changes:
0ede7d0e Rebuild patches
This commit is contained in:
Aikar 2018-09-03 04:14:40 -04:00
parent 6e9c306655
commit 222147db5d
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
11 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0006-Entity-Origin-API.patch
View file

@ -1,14 +1,14 @@
From c350ad1bbe75078257c7b9ea831d0b9fcfc4900e Mon Sep 17 00:00:00 2001 From 9318c7b2806647ec99349588486dd9f4dab0f763 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600 Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index ddda34de..f91b3fd3 100644 index e7d0ceb44..ce22ded94 100644
--- a/src/main/java/org/bukkit/entity/Entity.java --- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -527,4 +527,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable { @@ -545,4 +545,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@Override @Override
Spigot spigot(); Spigot spigot();
// Spigot end // Spigot end
@ -25,7 +25,7 @@ index ddda34de..f91b3fd3 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
index 0cd830d9..170a9aee 100644 index 0cd830d90..170a9aee5 100644
--- a/src/main/java/org/bukkit/entity/FallingBlock.java --- a/src/main/java/org/bukkit/entity/FallingBlock.java
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
@@ -51,4 +51,15 @@ public interface FallingBlock extends Entity { @@ -51,4 +51,15 @@ public interface FallingBlock extends Entity {
@ -45,7 +45,7 @@ index 0cd830d9..170a9aee 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
index fcd0a9b2..2abef57c 100644 index fcd0a9b2f..2abef57c9 100644
--- a/src/main/java/org/bukkit/entity/TNTPrimed.java --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
@@ -35,4 +35,15 @@ public interface TNTPrimed extends Explosive { @@ -35,4 +35,15 @@ public interface TNTPrimed extends Explosive {

6
Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
View file

@ -1,14 +1,14 @@
From bd7616fdffd024a27253dc7613e74e7fb600659b Mon Sep 17 00:00:00 2001 From 5738a5cbdbddb664a0392738369b750d28712ad7 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500 Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner() Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index f91b3fd3..4548c95b 100644 index ce22ded94..64f72ff83 100644
--- a/src/main/java/org/bukkit/entity/Entity.java --- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -537,5 +537,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { @@ -555,5 +555,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return Location where entity originates or null if not yet added * @return Location where entity originates or null if not yet added
*/ */
Location getOrigin(); Location getOrigin();

6
Spigot-API-Patches/0119-Entity-getChunk-API.patch
View file

@ -1,4 +1,4 @@
From 3692eca40551e4d7768b31aafc8e9da88ab680c3 Mon Sep 17 00:00:00 2001 From b1a6336cdd49f20687339e79f653f81c43953848 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 02:25:48 -0400 Date: Wed, 4 Jul 2018 02:25:48 -0400
Subject: [PATCH] Entity#getChunk API Subject: [PATCH] Entity#getChunk API
@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
Get the chunk the entity is currently registered to Get the chunk the entity is currently registered to
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 4548c95b9..573a69184 100644 index 64f72ff83..72ebe35fb 100644
--- a/src/main/java/org/bukkit/entity/Entity.java --- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@ -16,7 +16,7 @@ index 4548c95b9..573a69184 100644
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.EntityEffect; import org.bukkit.EntityEffect;
import org.bukkit.Nameable; import org.bukkit.Nameable;
@@ -544,5 +545,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { @@ -562,5 +563,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return True if entity spawned from a mob spawner * @return True if entity spawned from a mob spawner
*/ */
boolean fromMobSpawner(); boolean fromMobSpawner();

12
Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
View file

@ -1,4 +1,4 @@
From 5a02faef031b464f7df6fa511f9adc8ffa8562ec Mon Sep 17 00:00:00 2001 From adb1bf0b7b613b6d5da49bef66002db629bb0377 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 02:10:36 -0400 Date: Wed, 4 Jul 2018 02:10:36 -0400
Subject: [PATCH] Store reference to current Chunk for Entity and Block Subject: [PATCH] Store reference to current Chunk for Entity and Block
@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
of having to look it up by hashmap lookups. of having to look it up by hashmap lookups.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index b7c40d5ce..238139c73 100644 index b7c40d5ce6..238139c73a 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -33,7 +33,7 @@ public class Chunk implements IChunkAccess { @@ -33,7 +33,7 @@ public class Chunk implements IChunkAccess {
@ -94,7 +94,7 @@ index b7c40d5ce..238139c73 100644
// Do not pass along players, as doing so can get them stuck outside of time. // Do not pass along players, as doing so can get them stuck outside of time.
// (which for example disables inventory icon updates and prevents block breaking) // (which for example disables inventory icon updates and prevents block breaking)
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 044f7b5aa..591ae114c 100644 index 044f7b5aa0..591ae114cf 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
@@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -147,7 +147,7 @@ index 044f7b5aa..591ae114c 100644
private String entityKeyString; private String entityKeyString;
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 7390061bf..c69209497 100644 index 7390061bf0..c69209497b 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java --- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@ -167,7 +167,7 @@ index 7390061bf..c69209497 100644
@Nullable @Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index b542b17fd..9fc7ac8c0 100644 index 5cce3644d0..7a204e8edf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -9,6 +9,7 @@ import java.util.UUID; @@ -9,6 +9,7 @@ import java.util.UUID;
@ -178,7 +178,7 @@ index b542b17fd..9fc7ac8c0 100644
import org.bukkit.EntityEffect; import org.bukkit.EntityEffect;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;
@@ -40,6 +41,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -42,6 +43,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entity = entity; this.entity = entity;
} }

6
Spigot-Server-Patches/0023-Entity-Origin-API.patch
View file

@ -1,4 +1,4 @@
From 43ff1bdb607251450bc4ff1afb74108eddb1d4d2 Mon Sep 17 00:00:00 2001 From 5a9ad7efe623a2b35697e3ea12e6848b42ed1941 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600 Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API Subject: [PATCH] Entity Origin API
@ -118,10 +118,10 @@ index ce97cc99fa..cf359d6d9e 100644
flag = true; flag = true;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 9fc7ac8c02..249d8115e8 100644 index 7a204e8edf..0c9b7276fc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -787,4 +787,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -795,4 +795,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot; return spigot;
} }
// Spigot end // Spigot end

6
Spigot-Server-Patches/0055-Add-velocity-warnings.patch
View file

@ -1,4 +1,4 @@
From 3adf13e17f92b08fbb27e257a72a0b0627ce6a89 Mon Sep 17 00:00:00 2001 From dbd9b951dc856c1080f835b21d6582475f5ec079 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600 Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings Subject: [PATCH] Add velocity warnings
@ -17,10 +17,10 @@ index 6a7bdb9ab6..bd99aa72c4 100644
private final class BooleanWrapper { private final class BooleanWrapper {
private boolean value = true; private boolean value = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 249d8115e8..dedf1526e6 100644 index 0c9b7276fc..ae705e86f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -262,12 +262,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -264,12 +264,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public void setVelocity(Vector velocity) { public void setVelocity(Vector velocity) {
Preconditions.checkArgument(velocity != null, "velocity"); Preconditions.checkArgument(velocity != null, "velocity");
velocity.checkFinite(); velocity.checkFinite();

8
Spigot-Server-Patches/0191-Entity-fromMobSpawner.patch
View file

@ -1,11 +1,11 @@
From b07b931f168834c010651b70e6d2f5af384c0430 Mon Sep 17 00:00:00 2001 From d9a6d1fbf03dd21663d7bbb566f6b512c6566ade Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500 Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner() Subject: [PATCH] Entity#fromMobSpawner()
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 cad4894000..0e8c95d96b 100644 index 0a914974be..fe614e17f7 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
@@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -49,10 +49,10 @@ index a62e34f7f9..ef93f433d6 100644
if ( entity.world.spigotConfig.nerfSpawnerMobs ) if ( entity.world.spigotConfig.nerfSpawnerMobs )
{ {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index dedf1526e6..2801e34f6b 100644 index ae705e86f9..4e818198b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -826,5 +826,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -834,5 +834,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
Location origin = getHandle().origin; Location origin = getHandle().origin;
return origin == null ? null : origin.clone(); return origin == null ? null : origin.clone();
} }

6
Spigot-Server-Patches/0269-Fix-CraftEntity-hashCode.patch
View file

@ -1,4 +1,4 @@
From 2e16f435ec6ab6da2ff4da6794ada6b823dab342 Mon Sep 17 00:00:00 2001 From 49ddbf67c65ec58929bec051da47234e55e647ee Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 10 Jun 2018 20:20:15 -0400 Date: Sun, 10 Jun 2018 20:20:15 -0400
Subject: [PATCH] Fix CraftEntity hashCode Subject: [PATCH] Fix CraftEntity hashCode
@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
However, replaced it too to make it clearer of intent. However, replaced it too to make it clearer of intent.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 2801e34f6b..6af229ce2e 100644 index 4e818198b2..f4af6ea034 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -535,14 +535,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -537,14 +537,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false; return false;
} }
final CraftEntity other = (CraftEntity) obj; final CraftEntity other = (CraftEntity) obj;

2
work/Bukkit

@ -1 +1 @@
Subproject commit 9e031b7b21da70f3ad1de193432143ad189797c8 Subproject commit 8ab814cd5c415258aa0ab7617051ee4ea9f4e7bd

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 3037eb3e7caa6941b343c31dc72255132ad78f50 Subproject commit ee5efeb0dc59dc8178d467f635ae03806d05d061

2
work/Spigot

@ -1 +1 @@
Subproject commit 2440e18926007124b1b968b7d81b0aa29627c332 Subproject commit 0ede7d0e1032a561bea4a718cf08ad50380aaaae