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

Updated Upstream (CraftBukkit)

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

CraftBukkit Changes:
9e95da12 SPIGOT-5052: PlayerPortalEvent not called when nether is disabled
28ea3fd1 SPIGOT-5062: end_portal on an non-default end world crashes the server
4a07dc69 SPIGOT-5058: ClassCastException when getting InventoryHolder of lectern when it's destroyed
This commit is contained in:
Shane Freeder 2019-06-12 09:45:30 +01:00
parent ec405a6bea
commit 89182676ed
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
10 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch
View File

@ -1,11 +1,11 @@
From 4c1336f9d67a889fe0d04a810da74e5e680063e7 Mon Sep 17 00:00:00 2001
From 9cd2eba30c9ad0bb33b89c200f509e52c4a17d44 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index a38503574..052fccc7a 100644
index 4603165280..0cd9f83cc9 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
@ -17,7 +17,7 @@ index a38503574..052fccc7a 100644
public PlayerConnection playerConnection;
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
@@ -1444,13 +1444,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1441,13 +1441,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
this.server.server.getPluginManager().callEvent(event);
}
@ -40,7 +40,7 @@ index a38503574..052fccc7a 100644
this.cl = packetplayinsettings.e();
this.getDataWatcher().set(EntityPlayer.bt, (byte) packetplayinsettings.f());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cc31b8d4a..397349963 100644
index cc31b8d4ac..397349963d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1749,8 +1749,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch
View File

@ -1,14 +1,14 @@
From 5b570ba3ebf9b9dabb56aedf21cb2d224b7089a0 Mon Sep 17 00:00:00 2001
From a32cd2a1e8664cdfb37e1ef250719babc7b30b9a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 31 Jul 2016 16:33:03 -0500
Subject: [PATCH] Re-track players that dismount from other players
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 052fccc7a9..43827ba087 100644
index 0cd9f83cc9..5db5e15ac8 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -975,6 +975,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -972,6 +972,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (entity1 != entity && this.playerConnection != null) {
this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
}

6
Spigot-Server-Patches/0128-Optimise-removeQueue.patch
View File

@ -1,11 +1,11 @@
From 5e39ed432eb840ce8c889a58a8cac9262c6d8a96 Mon Sep 17 00:00:00 2001
From b1e81e895040ae32215f8fbea5cbd064ea2fd851 Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Fri, 25 Nov 2016 13:22:40 +0000
Subject: [PATCH] Optimise removeQueue
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e86943872d..7352ec5bb9 100644
index a7bf433a7f..be1f4f38ac 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@ -50,7 +50,7 @@ index e86943872d..7352ec5bb9 100644
this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
}
@@ -1318,7 +1327,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1315,7 +1324,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.lastHealthSent = -1.0F;
this.lastFoodSent = -1;
// this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit

6
Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch
View File

@ -1,4 +1,4 @@
From bbac62adc341afbf098253a53dc889320609b618 Mon Sep 17 00:00:00 2001
From c8062520bb3365534c7646e19905f5713cbd9d11 Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Tue, 27 Dec 2016 01:57:57 +0000
Subject: [PATCH] Properly fix item duplication bug
@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
Credit to prplz for figuring out the real issue
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 7352ec5bb9..607042a41c 100644
index be1f4f38ac..e16b30c6c0 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1791,7 +1791,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1788,7 +1788,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
protected boolean isFrozen() {

24
Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch
View File

@ -1,4 +1,4 @@
From ce331492aed4aa36862a7ee401f2621a6050a4a1 Mon Sep 17 00:00:00 2001
From 75812a59c9168330825ec524316fb545dd8dced4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
to "confirm" things based on if it was player triggered close or not.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index fc25b3c74..e316e2af7 100644
index fc25b3c749..e316e2af7d 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -149,7 +149,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -34,7 +34,7 @@ index fc25b3c74..e316e2af7 100644
this.activeContainer = this.defaultContainer;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 607042a41..30b684b04 100644
index e16b30c6c0..17255a650f 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -360,7 +360,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -55,7 +55,7 @@ index 607042a41..30b684b04 100644
}
String deathMessage = event.getDeathMessage();
@@ -1053,7 +1053,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1050,7 +1050,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return OptionalInt.empty();
} else {
if (this.activeContainer != this.defaultContainer) {
@ -64,7 +64,7 @@ index 607042a41..30b684b04 100644
}
this.nextContainerCounter();
@@ -1106,7 +1106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1103,7 +1103,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// CraftBukkit end
if (this.activeContainer != this.defaultContainer) {
@ -73,7 +73,7 @@ index 607042a41..30b684b04 100644
}
// this.nextContainerCounter(); // CraftBukkit - moved up
@@ -1170,7 +1170,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1167,7 +1167,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void closeInventory() {
@ -88,7 +88,7 @@ index 607042a41..30b684b04 100644
this.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 498483930..088873515 100644
index 498483930e..088873515c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2056,7 +2056,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -101,7 +101,7 @@ index 498483930..088873515 100644
this.player.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 90fd7d96b..132a2ceb7 100644
index 90fd7d96b3..132a2ceb78 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -402,7 +402,7 @@ public abstract class PlayerList {
@ -114,7 +114,7 @@ index 90fd7d96b..132a2ceb7 100644
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
cserver.getPluginManager().callEvent(playerQuitEvent);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5172ff53d..139168291 100644
index 5172ff53d3..139168291a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -981,7 +981,7 @@ public class WorldServer extends World {
@ -136,7 +136,7 @@ index 5172ff53d..139168291 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 300826a0f..4a941801b 100644
index 300826a0f2..4a941801b6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -616,8 +616,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@ -155,7 +155,7 @@ index 300826a0f..4a941801b 100644
@Override
public boolean isBlocking() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b49c3029f..a22bb25ff 100644
index b49c3029fc..a22bb25ff7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -772,7 +772,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -168,7 +168,7 @@ index b49c3029f..a22bb25ff 100644
// Check if the fromWorld and toWorld are the same.
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 47338c692..309cbd0dc 100644
index 47338c692a..309cbd0dc6 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1255,8 +1255,19 @@ public class CraftEventFactory {

6
Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch
View File

@ -1,11 +1,11 @@
From 19a485f578ae3a525479085eb4296343cd0bcce1 Mon Sep 17 00:00:00 2001
From e1503198f2794f9505dc26bff6d1b66e1b8ccde5 Mon Sep 17 00:00:00 2001
From: Caleb Bassham <caleb.bassham@gmail.com>
Date: Fri, 28 Sep 2018 02:32:19 -0500
Subject: [PATCH] Call player spectator target events
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 343680e3ba..0e35f6dc25 100644
index 5610f989ee..5553073f93 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -17,7 +17,7 @@ index 343680e3ba..0e35f6dc25 100644
public boolean worldChangeInvuln;
private boolean cp; private void setHasSeenCredits(boolean has) { this.cp = has; } // Paper - OBFHELPER
private final RecipeBookServer recipeBook;
@@ -1569,15 +1569,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1566,15 +1566,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity);
}

6
Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch
View File

@ -1,4 +1,4 @@
From d315b670e89491e9ec15d3f4e53642c49b1cbf07 Mon Sep 17 00:00:00 2001
From 612756d22eedb79bafe7dafe01da3f9a73b0b8cd Mon Sep 17 00:00:00 2001
From: GreenMeanie <GreenMeanieMC@gmail.com>
Date: Sat, 20 Oct 2018 22:34:02 -0400
Subject: [PATCH] Reset players airTicks on respawn
@ -18,10 +18,10 @@ index a6e5ac070c..85106e601c 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 0e35f6dc25..2f605365f7 100644
index 5553073f93..03a755e782 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1854,6 +1854,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
this.setHealth(this.getMaxHealth());

6
Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch
View File

@ -1,4 +1,4 @@
From 433c046606075a2bf2bcf46d2a0322de1d657f10 Mon Sep 17 00:00:00 2001
From b8f43a1019b8ba3e49e8a17eaef2854583349b66 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 15 Nov 2018 13:38:37 +0000
Subject: [PATCH] force entity dismount during teleportation
@ -112,10 +112,10 @@ index c357339c26..2806808328 100644
this.B(entity);
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 2f605365f7..7f89d45ed2 100644
index 03a755e782..ee77ad79db 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -994,11 +994,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
}

6
Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
View File

@ -1,14 +1,14 @@
From f91ab5badc408129e4af14c9604479b26da3e593 Mon Sep 17 00:00:00 2001
From e739a82561b4d23437245dd7759d687350aec420 Mon Sep 17 00:00:00 2001
From: connorhartley <vectrixu+gh@gmail.com>
Date: Mon, 7 Jan 2019 14:43:48 -0600
Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 64d1b72a87..0a67f48f66 100644
index 60cc81ef77..cce0c30fa3 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1280,6 +1280,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1277,6 +1277,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void n() {
this.ct = true;
this.ejectPassengers();

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 411609dc8199dd53dcafbf39e84ef9d3700703b8
Subproject commit 9e95da121eaff6a662dac862d2cae201e6bfb105