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

Add dolphin spit

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-20 00:16:07 -05:00
parent 563f4c8b84
commit ff4ffaa066
32 changed files with 517 additions and 163 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 07539f4ce3643cee95496fedb20ed575f77402f3 Mon Sep 17 00:00:00 2001
From c99d6744eeb5c60a89ef9610ad0262057780c6f1 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 ca6ff6380f..3c640ec8b3 100644
index d121e5080b..f2fdec4f1f 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 ca6ff6380f..3c640ec8b3 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2314,6 +2314,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2317,6 +2317,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 22a1c4ebfa..c4086ace1f 100644
index ff38e6c69c..d9bf65809d 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 {