Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4e0ed1f8 Backport fix for MC-167561 (Fixes #2886, closes#2960)
9946cef8 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-02-21 14:15:01 -06:00
parent c5ae95f138
commit a098378494
14 changed files with 66 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0047-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From ab95bc83469b54decf231cecc3f279df5ab9246d Mon Sep 17 00:00:00 2001
From 311a1c53877efc12983e72b3ade0b7ef0dcf6f9d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 11 Jan 2020 23:12:52 -0600
Subject: [PATCH] Add EntityPortalReadyEvent
@@ -11,7 +11,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
index 5e3ac055d2..35c162a902 100644
index 09c7c13183..6880cdd7f9 100644
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -54,6 +54,7 @@ public class BlockPortal extends Block {
@@ -86,7 +86,7 @@ index 5e3ac055d2..35c162a902 100644
break;
// CraftBukkit start - add the block to our list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3e5dd43626..43237a3d59 100644
index 4358505dc2..2e151ebc19 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -168,9 +168,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 3e5dd43626..43237a3d59 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2217,6 +2217,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2214,6 +2214,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.getMethodProfiler().enter("portal");
this.ag = i;
this.portalCooldown = this.ba();