spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-6693: Composters only take in one item at custom hopper speeds

Browse source
This commit is contained in:
md_5 2021-08-22 18:31:06 +10:00
parent b166a49b7b
commit 3c1fc60ae7
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
5 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 791eac3175d798bb3269585f432a49d169411bf3 Mon Sep 17 00:00:00 2001
From c6cb52c7abacfc354a1ccded7b218eaf27361c8b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 May 2017 15:16:15 +1000
Subject: [PATCH] Skeleton API Implementations
@ -37,10 +37,10 @@ index 3eeaa571..ba0bdf1e 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 1deb7c09..6f2be5d3 100644
index 64062724..a03770de 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2359,6 +2359,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2362,6 +2362,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);

6
Bukkit-Patches/0010-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From 74b1d2e5efcd003e25ee2efb7bbd4dce60ac1529 Mon Sep 17 00:00:00 2001
From 446f109b226f3164ecd48c43fbfe703468ba1ed4 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 6f2be5d3..cd594d9d 100644
index a03770de..01c631df 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2362,6 +2362,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2365,6 +2365,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
// Spigot start
public class Spigot {

6
Bukkit-Patches/0015-View-Distance.patch
View file

@ -1,4 +1,4 @@
From a8edec8ea17ac883ce02c7ecfc469a15f45989ca Mon Sep 17 00:00:00 2001
From 74e27c0c74604478bd636ab2b708d05f0e6717ac Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 30 Jul 2019 13:47:34 -0700
Subject: [PATCH] View Distance
@ -6,10 +6,10 @@ Subject: [PATCH] View Distance
This commit allows the retrieval of per world view distances.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index cd594d9d..2c0afc8e 100644
index 01c631df..dd0fef91 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2359,6 +2359,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2362,6 +2362,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);

18
CraftBukkit-Patches/0016-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From 5689f19ce9aefa54f8554332f72bb85c0e2a84af Mon Sep 17 00:00:00 2001
From 05f3ebcb3b6a62f56ab420402e604a222de4a790 Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Customisations
@ -6,7 +6,7 @@ Subject: [PATCH] Hopper Customisations
Allows editing hopper cooldowns and amount transferred per tick.
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
index d2e67cfa4..7855259f1 100644
index d2e67cfa4..4c29bf524 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
@@ -142,9 +142,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@ -114,7 +114,19 @@ index d2e67cfa4..7855259f1 100644
iinventory.setItem(i, itemstack1);
}
@@ -415,7 +423,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -388,6 +396,11 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
boolean flag1 = iinventory1.isEmpty();
if (itemstack1.isEmpty()) {
+ // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
+ if (!itemstack.isEmpty() && itemstack.getCount() > iinventory1.getMaxStackSize()) {
+ itemstack = itemstack.cloneAndSubtract(iinventory1.getMaxStackSize());
+ }
+ // Spigot end
iinventory1.setItem(i, itemstack);
itemstack = ItemStack.EMPTY;
flag = true;
@@ -415,7 +428,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
}
}

6
CraftBukkit-Patches/0052-Prevent-hoppers-from-loading-chunks.patch
View file

@ -1,14 +1,14 @@
From dd514e3368af200dda2da6c09817e2a0839d55a0 Mon Sep 17 00:00:00 2001
From 14a495a2c666343741510192e915605f9906dd47 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 5 Mar 2014 20:27:27 +0000
Subject: [PATCH] Prevent hoppers from loading chunks
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
index 7855259f1..f5673ce91 100644
index 4c29bf524..622e30d06 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
@@ -461,6 +461,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -466,6 +466,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
private static IInventory a(World world, double d0, double d1, double d2) {
Object object = null;
BlockPosition blockposition = new BlockPosition(d0, d1, d2);