Updated Upstream (CraftBukkit) (#9053)
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: f92c94517 SPIGOT-7310: PlayerToggleSneakEvent is not called when a player sneaks while riding an entity b5714184d SPIGOT-7316: Cancelling EntityUnmountEvent does not stop the all effects of the unmounting e237f8c88 SPIGOT-7312: Entity#setVisibleByDefault on player causes skin reset on this player client
This commit is contained in:
parent
a622ebacd4
commit
fbf74ba0ac
70 changed files with 226 additions and 207 deletions
|
@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 575fb9a95e38e68f7d8af1482f6e4166c5112dde..e67095f26df56e5edd8477601feeab346998f507 100644
|
||||
index e4c6bff2a1e601266d889cc0532827d0c8885ece..d9cacc372e1d40e6b2b5d83c88a01121b7f3f101 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -2210,7 +2210,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -2221,7 +2221,7 @@ public class ServerPlayer extends Player {
|
||||
|
||||
if (retainOwnership) {
|
||||
if (!itemstack1.isEmpty()) {
|
||||
|
@ -18,10 +18,10 @@ index 575fb9a95e38e68f7d8af1482f6e4166c5112dde..e67095f26df56e5edd8477601feeab34
|
|||
|
||||
this.awardStat(Stats.DROP);
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
index 532e2444e15e532d6be5f703bfa5de26c5bc3957..496e10067267df07db9fa2570786d3b281f432c1 100644
|
||||
index eb0f9c2e54d75ee80bcc421d1042d1eea7c57a16..997b2458a3e14296437e76737b837d90d4936072 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
@@ -716,6 +716,11 @@ public abstract class Player extends LivingEntity {
|
||||
@@ -722,6 +722,11 @@ public abstract class Player extends LivingEntity {
|
||||
}
|
||||
|
||||
double d0 = this.getEyeY() - 0.30000001192092896D;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue