Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes: 4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support eea43870 MC-134115: Fix issues converting tile entities 1a7f2d10 SPIGOT-4397: isChunkGenerated API 40aed54d SPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From f144da0f68e58501c0d831f61b0838312688b069 Mon Sep 17 00:00:00 2001
|
||||
From 94a46fefc0d5a307953ae1c8b73a174484981330 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,10 +7,10 @@ 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index ca6107a5af..9f2a08b03d 100644
|
||||
index a8705776a6..36f4231427 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -894,7 +894,7 @@ public class Chunk implements IChunkAccess {
|
||||
@@ -906,7 +906,7 @@ public class Chunk implements IChunkAccess {
|
||||
{
|
||||
if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
|
||||
{
|
||||
@@ -19,7 +19,7 @@ index ca6107a5af..9f2a08b03d 100644
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -919,7 +919,7 @@ public class Chunk implements IChunkAccess {
|
||||
@@ -931,7 +931,7 @@ public class Chunk implements IChunkAccess {
|
||||
{
|
||||
if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
|
||||
{
|
||||
@@ -110,10 +110,10 @@ index 3644fde3bb..68f5842cfe 100644
|
||||
this.m();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 4cdf790029..793174c51b 100644
|
||||
index 7c183ff6fa..7704a2bc6a 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -2055,7 +2055,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
@@ -2057,7 +2057,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
|
||||
|
||||
if (this.player.isFrozen()) return; // CraftBukkit
|
||||
|
||||
Reference in New Issue
Block a user