mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2025-01-26 10:01:21 +01:00
7f24790a35
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: cf37529 Updated Upstream (Paper) EMC Changes: 27282006 Updated Paper 456edfa4 One more try to fix more chunks on reload Purpur Changes: 45d5e9a Fix dolphin spit and phantom flames 9e1b8e7 Clean up teleport outside border patch Add sleeping, inventory, and toWorld checks 8428580 [ci-skip] Add 'fast' argument to './purpur jar' to speed up jenkins build time cea486c Updated Upstream (Paper) 6cd244c Fix infinite furnaces triggering without lava source a989361 Fix infinite furnaces leaving empty buckets 6cf1672 Add config option for whether Nether Wart farming Villagers should throw extra Nether Warts at other Villagers 07d4056 Add toggle for Zombified Piglin death always counting as a player kill when angry (Zombified Piglin XP farm nerf option) 9935466 Add config option for Cleric Villagers to farm Nether Wart 47a1707 fix typos 6e42ce8 Updated Upstream (Paper) 740b7d2 [ci-skip] Update readme with downloads API info AirplaneLite Changes: 5526dde Add download link to readme
37 lines
2.2 KiB
Diff
37 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Bud Gidiere <sgidiere@gmail.com>
|
|
Date: Sun, 25 Oct 2020 12:24:19 -0500
|
|
Subject: [PATCH] Infinity No Arrows
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
index 4b19f01c891b23a8da7a39d6ae63f229bcb8e198..fab44dafa479a97a69499b6af500e45c77612c81 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -2137,7 +2137,7 @@ public abstract class EntityHuman extends EntityLiving {
|
|
}
|
|
}
|
|
|
|
- return this.abilities.canInstantlyBuild ? new ItemStack(Items.ARROW) : ItemStack.b;
|
|
+ return this.abilities.canInstantlyBuild || (world.purpurConfig.infinityWorksWithNoArrows && EnchantmentManager.getEnchantmentLevel(Enchantments.ARROW_INFINITE, itemstack) > 0) ? new ItemStack(Items.ARROW) : ItemStack.b; // Yatopia
|
|
}
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index 117e32be8c34f264cfeae78081abefb487cab5f3..03b642a40b0082d5c1b852ac34b691f0cace27ba 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -176,10 +176,12 @@ public class PurpurWorldConfig {
|
|
public boolean infinityWorksWithNormalArrows = true;
|
|
public boolean infinityWorksWithSpectralArrows = false;
|
|
public boolean infinityWorksWithTippedArrows = false;
|
|
+ public boolean infinityWorksWithNoArrows = false;
|
|
private void infinityArrowsSettings() {
|
|
infinityWorksWithNormalArrows = getBoolean("gameplay-mechanics.infinity-bow.normal-arrows", infinityWorksWithNormalArrows);
|
|
infinityWorksWithSpectralArrows = getBoolean("gameplay-mechanics.infinity-bow.spectral-arrows", infinityWorksWithSpectralArrows);
|
|
infinityWorksWithTippedArrows = getBoolean("gameplay-mechanics.infinity-bow.tipped-arrows", infinityWorksWithTippedArrows);
|
|
+ infinityWorksWithNoArrows = getBoolean("gameplay-mechanics.infinity-bow.no-arrows", infinityWorksWithNoArrows);
|
|
}
|
|
|
|
public boolean signAllowColors = false;
|