Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 12:05:53 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (CraftBukkit)

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

CraftBukkit Changes:
b530534f0 Remove some outdated PAIL comments
This commit is contained in:
Aikar 2021-04-04 03:22:27 -04:00
parent 3bc888ba60
commit e8889e96a5
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -788,7 +788,7 @@ index 21f5474a1cd60168ca059da542a432d40d88b514..07ca1234ad6ffa797003f7317fb88abf
int k = 0; int k = 0;
CustomFunction.c[] acustomfunction_c = customfunction.b(); CustomFunction.c[] acustomfunction_c = customfunction.b();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 08443ca31ead7c484f0faeef57305c28d74c0e3f..422ee5fb0d917399b2b1e5d893219405c5dbe82d 100644 index 8203192a94da26e8bfd6cf9999a2b2e8d26b1acf..4555a94cdb0a22f5f562099ac6ac0db454ff60c4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -174,7 +174,7 @@ import org.bukkit.craftbukkit.Main; @@ -174,7 +174,7 @@ import org.bukkit.craftbukkit.Main;
@ -1063,7 +1063,7 @@ index 8e2e415a022ccd486465f19d9bbf1f287b21fb95..59942eb6bb6e8e1e9a988bce0d09757e
} }
diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
index 3055ef62a054d91a74552f83f7afdfe08c7880db..95af66ebb7849cbf2bcad6bc52aeb85ab2601b6c 100644 index 0b5bcb60472c778574702a5ac26a6d02d54bfeac..9ed97d5db81e3603ccccca7500420d7e401ef2a5 100644
--- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
@@ -344,11 +344,13 @@ public class ChunkProviderServer extends IChunkProvider { @@ -344,11 +344,13 @@ public class ChunkProviderServer extends IChunkProvider {
@ -1455,7 +1455,7 @@ index 5d1bbc42b4d65aa735570c53e4e6bc9e08899749..c601a5c577e438a3fa8dd4c5f36dbe94
public WhiteList getWhitelist() { public WhiteList getWhitelist() {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9af9d9463e9b50f8a627ffd79dcd3716c506f7e7..db8970539f7f69c9087abe43286bca008cb4594d 100644 index 2bea2f4748cadf479dd4f89792ef5ffdd88e9cab..306f6c0db2333cce5dfc4bf1c09bfef05119a28b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -116,7 +116,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent; @@ -116,7 +116,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -1491,7 +1491,7 @@ index 9af9d9463e9b50f8a627ffd79dcd3716c506f7e7..db8970539f7f69c9087abe43286bca00
protected BlockPosition ap() { protected BlockPosition ap() {
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index feb640a21f4d0b00d85c1c4f013c22454616578a..98f5f1dcd0abf9272533bf3801bab316c9f0a12c 100644 index c76ab1e6a54399eddae1ef2a595778385cd50026..661c3e2f12de36167bff149a3d979c4581402cbc 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -135,7 +135,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -135,7 +135,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -1529,7 +1529,7 @@ index feb640a21f4d0b00d85c1c4f013c22454616578a..98f5f1dcd0abf9272533bf3801bab316
- SpigotTimings.timerEntityTickRest.stopTiming(); // Spigot - SpigotTimings.timerEntityTickRest.stopTiming(); // Spigot
} }
public void updateEquipment() { // PAIL private->public; updateEquipment public void updateEquipment() {
@@ -2772,7 +2767,6 @@ public abstract class EntityLiving extends Entity { @@ -2772,7 +2767,6 @@ public abstract class EntityLiving extends Entity {
this.setMot(d4, d5, d6); this.setMot(d4, d5, d6);

4
Spigot-Server-Patches/0038-Send-absolute-position-the-first-time-an-entity-is-s.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Send absolute position the first time an entity is seen
diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
index a95867c0ba7dec750e07a4ac623ee30b4522fe55..f5227aa761d326376d057eaadcdbef024ed30241 100644 index 9ad74b380a92e3a563e1a891e81401d8b4707bcf..beb0beb716869978be6bc5a78ce3b6cf785c5aee 100644
--- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java --- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
@@ -4,6 +4,7 @@ import com.google.common.collect.Lists; @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
@ -49,7 +49,7 @@ index a95867c0ba7dec750e07a4ac623ee30b4522fe55..f5227aa761d326376d057eaadcdbef02
this.trackedPlayers = trackedPlayers; this.trackedPlayers = trackedPlayers;
// CraftBukkit end // CraftBukkit end
this.m = Vec3D.ORIGIN; this.m = Vec3D.ORIGIN;
@@ -190,7 +206,25 @@ public class EntityTrackerEntry { @@ -189,7 +205,25 @@ public class EntityTrackerEntry {
} }
if (packet1 != null) { if (packet1 != null) {

4
Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Update entity Metadata for all tracked players
diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
index 44b79c97d5cc7570683e1b7f025b4f3ad65beb81..bcc1103e21cc10d5b405a2b89f3dfe78eda271bd 100644 index e3cdea3c85d762af6984f3dbe544fdfe101f6ff6..6110d7723b70df5380338a42b5cbff3446294bac 100644
--- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java --- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
@@ -422,6 +422,12 @@ public class EntityTrackerEntry { @@ -421,6 +421,12 @@ public class EntityTrackerEntry {
return PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc); return PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc);
} }

6
Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Reduce allocation of Vec3D by entity tracker
diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
index 4c82266656d0a60a166faa082a9aaaaed7f062d3..aa5ba862f18ff706f11b0b26cea55a904a5a9473 100644 index b64aa6c9ce906b08e43891f8c465fa4e8b2a8906..58dd349adf2bc9bac6569464ef7a7aec81729e79 100644
--- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java --- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
@@ -156,8 +156,12 @@ public class EntityTrackerEntry { @@ -155,8 +155,12 @@ public class EntityTrackerEntry {
++this.o; ++this.o;
i = MathHelper.d(this.tracker.yaw * 256.0F / 360.0F); i = MathHelper.d(this.tracker.yaw * 256.0F / 360.0F);
j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F); j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F);
@ -23,7 +23,7 @@ index 4c82266656d0a60a166faa082a9aaaaed7f062d3..aa5ba862f18ff706f11b0b26cea55a90
Packet<?> packet1 = null; Packet<?> packet1 = null;
boolean flag2 = flag1 || this.tickCounter % 60 == 0; boolean flag2 = flag1 || this.tickCounter % 60 == 0;
boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1; boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1;
@@ -174,9 +178,11 @@ public class EntityTrackerEntry { @@ -173,9 +177,11 @@ public class EntityTrackerEntry {
// CraftBukkit end // CraftBukkit end
if (this.tickCounter > 0 || this.tracker instanceof EntityArrow) { if (this.tickCounter > 0 || this.tracker instanceof EntityArrow) {

4
Spigot-Server-Patches/0680-do-not-create-unnecessary-copies-of-passenger-list.patch
View File

@ -18,7 +18,7 @@ index edc6fff87c4abad2c123b1a46d6e5b792602b3be..5e739b26b6b5490b2c7651d3e9ff8649
this.b = new int[list.size()]; this.b = new int[list.size()];
diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java diff --git a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
index aa5ba862f18ff706f11b0b26cea55a904a5a9473..f65eb0168ed365e5c1b490c56ec84e3b7ff87c1d 100644 index 58dd349adf2bc9bac6569464ef7a7aec81729e79..1df8fb8cb3fcf8201e1c5fa8ca13f7a9c632c379 100644
--- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java --- a/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/level/EntityTrackerEntry.java
@@ -103,10 +103,10 @@ public class EntityTrackerEntry { @@ -103,10 +103,10 @@ public class EntityTrackerEntry {
@ -34,7 +34,7 @@ index aa5ba862f18ff706f11b0b26cea55a904a5a9473..f65eb0168ed365e5c1b490c56ec84e3b
this.broadcastIncludingSelf(new PacketPlayOutMount(this.tracker)); // CraftBukkit this.broadcastIncludingSelf(new PacketPlayOutMount(this.tracker)); // CraftBukkit
} }
@@ -377,7 +377,7 @@ public class EntityTrackerEntry { @@ -376,7 +376,7 @@ public class EntityTrackerEntry {
} }
} }

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit f1613d6ad1b63e08f8efb2b3e78141880de4f0b9 Subproject commit b530534f03b449539028e2adead9ef1150b2d9d0