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

Update Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-27 02:10:47 -05:00
parent 129f437d52
commit 3bc14897d5
14 changed files with 514 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 70c007b806075c1d970b6ff24135f6565b0db779 Mon Sep 17 00:00:00 2001
From d0fcd4fa5e28fce81ed0b07be035d1059c3da8f3 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
@@ -86,7 +86,7 @@ index 09c7c13183..6880cdd7f9 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 dda36e7152..c037657ab1 100644
index 51b2e745ef..8d8dec2d1b 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 dda36e7152..c037657ab1 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2354,6 +2354,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2388,6 +2388,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.getMethodProfiler().enter("portal");
this.ag = i;
this.portalCooldown = this.ba();
@@ -141,7 +141,7 @@ index f84dd6d9be..f50e9670bc 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5d14939873..1a2a1be545 100644
index c48994f4b5..ff405cbb43 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -65,7 +65,7 @@ public class WorldServer extends World {