Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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:
21faf822 Implement optional per player mobspawning (#2171)
88722ec8 Prevent consuming the wrong itemstack (#2477)
294e3046 Async chunk api/io/loading (#2308)
This commit is contained in:
William Blake Galbreath
2019-08-22 13:16:02 -05:00
parent 5b4de6e7e8
commit 8dbd6295e7
24 changed files with 88 additions and 4470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0008-Silk-touch-spawners.patch
View File

@@ -1,4 +1,4 @@
From c246b29621a8e2c62825e2a9d00a27f03e1c20b9 Mon Sep 17 00:00:00 2001
From 8d144c45e81724e07c172eb3f7d06f6e4f105dfa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 14:27:37 -0500
Subject: [PATCH] Silk touch spawners
@@ -78,7 +78,7 @@ index bb77d916a..974a5d281 100644
return i;
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index a7fc34f85..e4fdf01dc 100644
index 612b9b7e3..f8308c96b 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -135,10 +135,17 @@ public class EntityTypes<T extends Entity> {
@@ -99,7 +99,7 @@ index a7fc34f85..e4fdf01dc 100644
public static Optional<EntityTypes<?>> a(String s) {
return IRegistry.ENTITY_TYPE.getOptional(MinecraftKey.a(s));
}
@@ -257,6 +264,12 @@ public class EntityTypes<T extends Entity> {
@@ -258,6 +265,12 @@ public class EntityTypes<T extends Entity> {
return this.ba;
}
@@ -112,7 +112,7 @@ index a7fc34f85..e4fdf01dc 100644
public String f() {
if (this.bf == null) {
this.bf = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this));
@@ -265,6 +278,7 @@ public class EntityTypes<T extends Entity> {
@@ -266,6 +279,7 @@ public class EntityTypes<T extends Entity> {
return this.bf;
}
@@ -163,5 +163,5 @@ index 84646dbc2..987297634 100644
public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
--
2.20.1
2.23.0.rc1