Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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:
979b53a7 Do not allow bee's to load chunks for beehives
13cb8373 Remote Connections shouldn't hold up shutdown
7dac5467 Fix bug in double register fix
87829d83 Remove incorrect IO flush for save-all that doesn't have flush parameter
31e751cb Fix unregistering entities from unloading chunks
bc351f6e Ensure Entity is never double registered
2ec0274b Fix many issues with dupe uuid resolve patch
756da10d (Actually) Don't duplicate velocity entry into hidden-configs
9b3679fb Don't duplicate velocity entry into hidden-configs
28cf6540 Pillager patrol spawn settings and per player options (#2924)
6bf04cd5 Reduce entity tracker updates on move
This commit is contained in:
William Blake Galbreath
2020-03-31 19:27:23 -05:00
parent 27fb33e6dc
commit 193b218210
16 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From fccd15c95e2e0e836a9b3520c728d9017c1e7df0 Mon Sep 17 00:00:00 2001
From 37ed97b94d7947d693c771b1a3efe2b903e514df 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,10 +86,10 @@ index 09c7c1318..6880cdd7f 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 819054106..39d84296f 100644
index c0e4c42f1..da7cdacaa 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
@@ -169,9 +169,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
protected boolean af; public final boolean inPortal() { return this.af; } // Paper - OBFHELPER
protected int ag;
public DimensionManager dimension;
@@ -102,7 +102,7 @@ index 819054106..39d84296f 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2219,6 +2219,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2220,6 +2220,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 f84dd6d9b..f50e9670b 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 18f6aedc9..368b4ea3a 100644
index 173bc91a9..a47ed872a 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 {