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

Updated Upstream (Paper)

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

Paper Changes:
33a615de Add option to nerf pigmen from nether portals (#2937)
125a517d Update upstream CB
This commit is contained in:
William Blake Galbreath
2020-02-18 20:13:10 -06:00
parent 9e073631de
commit c98e91e6e3
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0046-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From 92f64802ef183824cb3232e402b9744e080915aa Mon Sep 17 00:00:00 2001
From b0b0cad4048e31429191654fdce85c7b88e7dc24 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,10 +11,10 @@ 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 2dc3ab4cf..1c0df77c2 100644
index 5e3ac055d..35c162a90 100644
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -52,6 +52,7 @@ public class BlockPortal extends Block {
@@ -54,6 +54,7 @@ public class BlockPortal extends Block {
}
@@ -22,7 +22,7 @@ index 2dc3ab4cf..1c0df77c2 100644
public boolean a(GeneratorAccess generatoraccess, BlockPosition blockposition) {
BlockPortal.Shape blockportal_shape = this.b(generatoraccess, blockposition);
@@ -65,8 +66,8 @@ public class BlockPortal extends Block {
@@ -67,8 +68,8 @@ public class BlockPortal extends Block {
}
}
@@ -33,7 +33,7 @@ index 2dc3ab4cf..1c0df77c2 100644
BlockPortal.Shape blockportal_shape = new BlockPortal.Shape(generatoraccess, blockposition, EnumDirection.EnumAxis.X);
if (blockportal_shape.d() && blockportal_shape.e == 0) {
@@ -187,6 +188,7 @@ public class BlockPortal extends Block {
@@ -189,6 +190,7 @@ public class BlockPortal extends Block {
private int height;
private int width;
java.util.List<org.bukkit.block.BlockState> blocks = new java.util.ArrayList<org.bukkit.block.BlockState>(); // CraftBukkit - add field
@@ -41,7 +41,7 @@ index 2dc3ab4cf..1c0df77c2 100644
public Shape(GeneratorAccess generatoraccess, BlockPosition blockposition, EnumDirection.EnumAxis enumdirection_enumaxis) {
this.a = generatoraccess;
@@ -226,14 +228,14 @@ public class BlockPortal extends Block {
@@ -228,14 +230,14 @@ public class BlockPortal extends Block {
for (i = 0; i < 22; ++i) {
BlockPosition blockposition1 = blockposition.shift(enumdirection, i);
@@ -58,7 +58,7 @@ index 2dc3ab4cf..1c0df77c2 100644
}
public int a() {
@@ -268,7 +270,7 @@ public class BlockPortal extends Block {
@@ -270,7 +272,7 @@ public class BlockPortal extends Block {
if (i == 0) {
block = this.a.getType(blockposition.shift(this.d)).getBlock();
@@ -67,7 +67,7 @@ index 2dc3ab4cf..1c0df77c2 100644
break label56;
// CraftBukkit start - add the block to our list
} else {
@@ -278,7 +280,7 @@ public class BlockPortal extends Block {
@@ -280,7 +282,7 @@ public class BlockPortal extends Block {
}
} else if (i == this.width - 1) {
block = this.a.getType(blockposition.shift(this.c)).getBlock();
@@ -76,7 +76,7 @@ index 2dc3ab4cf..1c0df77c2 100644
break label56;
// CraftBukkit start - add the block to our list
} else {
@@ -291,7 +293,7 @@ public class BlockPortal extends Block {
@@ -293,7 +295,7 @@ public class BlockPortal extends Block {
}
for (i = 0; i < this.width; ++i) {
@@ -86,7 +86,7 @@ index 2dc3ab4cf..1c0df77c2 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 a2fe1a424..fc9d288de 100644
index 3e5dd4362..43237a3d5 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 a2fe1a424..fc9d288de 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2210,6 +2210,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2217,6 +2217,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.getMethodProfiler().enter("portal");
this.ag = i;
this.portalCooldown = this.ba();