[Auto] Updated Upstream (Bukkit/CraftBukkit)
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: 7634491f Added Entity#setRotation. CraftBukkit Changes: 0e1cea5a Added Entity#setRotation.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From a3bcf6f34aeef3c2d225a81b1df7ed35c134abb5 Mon Sep 17 00:00:00 2001
|
||||
From 7cf1b664e72ac6c1deecb241d9c9577c5e32777e 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
|
||||
@@ -155,10 +155,10 @@ index 9b19dce9b..cb7697f80 100644
|
||||
public boolean isBlocking() {
|
||||
return getHandle().isBlocking();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index e8450a565..29eeb3e29 100644
|
||||
index 62235efde..47426d8fd 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -738,7 +738,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -743,7 +743,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
||||
// Close any foreign inventory
|
||||
if (getHandle().activeContainer != getHandle().defaultContainer) {
|
||||
@@ -168,7 +168,7 @@ index e8450a565..29eeb3e29 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 e75c188b5..167a3baec 100644
|
||||
index acc80d068..2cfe8afe1 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -1110,8 +1110,19 @@ public class CraftEventFactory {
|
||||
|
||||
Reference in New Issue
Block a user