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

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0161-Dont-run-with-scissors.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Dont run with scissors!
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 25c5d4c7c2db31c7a8c04a862928c6743ab5b130..9a2da610017064c914f84701f2b83d70f887acdb 100644
index 4279bb45a75a9ae0510fa96bdee4efd331433e3e..0d3e73240e5d363427379f50ecb163482c6f1bfc 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1575,6 +1575,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1498,6 +1498,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
this.player.fallDistance = 0.0F;
}
@@ -43,10 +43,10 @@ index 00a5c65439a30499156a10b1822760fe48ee7776..3b68981645eb70df8828d437411564e8
public static int seedFeatureBamboo = -1;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 56bed5e58d49196f1f94660dbd88a9fae99a9be7..0cb4b3d9084646b493418dea60323752db3f13a0 100644
index 0b1f0a4530ffda4fd4e2b7f7b4487f7c0e466476..eb536735310a3d2fe8adb65b0aed543a5d6f6add 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -156,6 +156,8 @@ public class PurpurWorldConfig {
@@ -155,6 +155,8 @@ public class PurpurWorldConfig {
public List<Item> itemImmuneToExplosion = new ArrayList<>();
public List<Item> itemImmuneToFire = new ArrayList<>();
public List<Item> itemImmuneToLightning = new ArrayList<>();
@@ -55,7 +55,7 @@ index 56bed5e58d49196f1f94660dbd88a9fae99a9be7..0cb4b3d9084646b493418dea60323752
private void itemSettings() {
itemImmuneToCactus.clear();
getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
@@ -193,6 +195,8 @@ public class PurpurWorldConfig {
@@ -192,6 +194,8 @@ public class PurpurWorldConfig {
Item item = Registry.ITEM.get(new ResourceLocation(key.toString()));
if (item != Items.AIR) itemImmuneToLightning.add(item);
});