Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases 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:
01334e7d #616: Fix exception on entity portal teleport attempt
This commit is contained in:
Shane Freeder
2020-01-14 21:43:50 +00:00
parent 1d5bd44d13
commit 0f795c3e8a
15 changed files with 62 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch
View File

@@ -1,4 +1,4 @@
From 8996cf4eb8f8e366f94047a5fdbf9f808fe2128c Mon Sep 17 00:00:00 2001
From a9838a0c3ea9f5301368717247ba1d5fb5b32fce 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
@@ -34,7 +34,7 @@ index ba3e6b882..2265b01e6 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 0a1f82c10..9fd94b884 100644
index 225721d1f..0ac63f0ba 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -168,10 +168,10 @@ index 78a328099..b93bafb3f 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 13598e3bb..bb48d44ff 100644
index caf277439..f931fa48b 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1292,8 +1292,19 @@ public class CraftEventFactory {
@@ -1293,8 +1293,19 @@ public class CraftEventFactory {
return event;
}