Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Bukkit Changes:
9d0221aa API to get client side view distance.
9be7f0ea SPIGOT-4395: Additions to PlayerBedEnterEvent.
01e534c6 Minor cosmetic cleanups to imports etc

CraftBukkit Changes:
96c461b3 API to get client side view distance.
e2785f4e Remove note about development build
a8000588 SPIGOT-4395: Additions to PlayerBedEnterEvent.

Spigot Changes:
117d4f7e Rebuild patches
This commit is contained in:
Shane Freeder
2018-11-03 00:23:27 +00:00
parent 6c2709118f
commit 1e39773b53
68 changed files with 465 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
View File

@@ -1,4 +1,4 @@
From 821283c8c5aae41af68928e9508781ffefc04170 Mon Sep 17 00:00:00 2001
From eea9dc9ae3dbf89daf49cfe290eec61f955b3b5c 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
@@ -29,10 +29,10 @@ index 44f37f50a7..864691f873 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 09064fa05d..125b8ef340 100644
index 1d97a5442c..d510ef63d1 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -162,7 +162,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -161,7 +161,7 @@ public abstract class EntityHuman extends EntityLiving {
this.dg();
super.tick();
if (!this.world.isClientSide && this.activeContainer != null && !this.activeContainer.canUse(this)) {
@@ -41,7 +41,7 @@ index 09064fa05d..125b8ef340 100644
this.activeContainer = this.defaultContainer;
}
@@ -364,6 +364,13 @@ public abstract class EntityHuman extends EntityLiving {
@@ -363,6 +363,13 @@ public abstract class EntityHuman extends EntityLiving {
return this.getHealth() <= 0.0F || this.isSleeping();
}
@@ -56,10 +56,10 @@ index 09064fa05d..125b8ef340 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 77bdb1db77..8901ea8e46 100644
index edef46ac31..9dcf29609a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -346,7 +346,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -347,7 +347,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// Paper end
if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
@@ -68,7 +68,7 @@ index 77bdb1db77..8901ea8e46 100644
this.activeContainer = this.defaultContainer;
}
@@ -552,7 +552,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -553,7 +553,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.inventory.clear();
}
@@ -77,7 +77,7 @@ index 77bdb1db77..8901ea8e46 100644
this.setSpectatorTarget(this); // Remove spectated target
// CraftBukkit end
@@ -864,7 +864,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -865,7 +865,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.a((new ChatMessage("container.spectatorCantOpen", new Object[0])).a(EnumChatFormat.RED), true);
} else {
if (this.activeContainer != this.defaultContainer) {
@@ -86,7 +86,7 @@ index 77bdb1db77..8901ea8e46 100644
}
if (iinventory instanceof ITileInventory) {
@@ -930,7 +930,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -931,7 +931,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// CraftBukkit end
if (this.activeContainer != this.defaultContainer) {
@@ -95,7 +95,7 @@ index 77bdb1db77..8901ea8e46 100644
}
this.nextContainerCounter();
@@ -995,7 +995,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -996,7 +996,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void closeInventory() {
@@ -155,7 +155,7 @@ index 7070917547..c9cbf69798 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 5443000bdf..a0c0c96a28 100644
index 8699cc72f1..0f1d700c73 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -740,7 +740,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,10 +168,10 @@ index 5443000bdf..a0c0c96a28 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 bc175d4c51..402574f559 100644
index 2e39a988bc..265b266325 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -948,8 +948,19 @@ public class CraftEventFactory {
@@ -988,8 +988,19 @@ public class CraftEventFactory {
return event;
}