spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-08-05 16:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re enable hopper check option but keep it off by default.

Browse source 
This option *will* break all but trivial hopper contraptions.
This commit is contained in:
md_5 2017-02-10 15:59:57 +11:00
parent b4417b8d18
commit 65a0347010
20 changed files with 93 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0001-POM-Changes.patch
View file

@ -1,4 +1,4 @@
From 864c9e13d5e6f66e48b41a27e3b953a6aea88bf1 Mon Sep 17 00:00:00 2001
From 38a8c60a34861f1a38f3e86adc2749a0ae77c910 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
diff --git a/pom.xml b/pom.xml
index 703b93a..6d019d1 100644
index f8a66e5..41ba4dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -47,7 +47,7 @@ index 703b93a..6d019d1 100644
<scope>compile</scope>
</dependency>
@@ -57,6 +64,11 @@
<version>5.1.39</version>
<version>5.1.40</version>
<scope>compile</scope>
</dependency>
+ <dependency>

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

@ -1,4 +1,4 @@
From 3b7c7b8c8097187652b24c50e7c4fde945d491a4 Mon Sep 17 00:00:00 2001
From 7a1e454cd79e4a1def9d249f5ac3f866f51db688 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -25,10 +25,10 @@ index 39d4dae..e8f0dd3 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index fa7e8c7..ea5ae62 100644
index 191501e..808f745 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1545,4 +1545,14 @@ public class CraftWorld implements World {
@@ -1546,4 +1546,14 @@ public class CraftWorld implements World {
cps.unload(chunk);
}
}

12
CraftBukkit-Patches/0005-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From e4532dc43d3a93e0dfe229c9a9103e6e913555fa Mon Sep 17 00:00:00 2001
From 6951ff29c90372d73fb3b0397660a0d66837b4fa Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -35,7 +35,7 @@ index 71eb615..9d2d7af 100644
if (!this.getOnlineMode()) {
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e6a28cc..c63cedd 100644
index 59b5e5a..06e0180 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -97,6 +97,7 @@ public abstract class World implements IBlockAccess {
@ -95,7 +95,7 @@ index e8f0dd3..343846f 100644
int pollCount = 0;
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index f9760b6..822c912 100644
index 4467eee..a151451 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -118,6 +118,14 @@ public class Main {
@ -115,7 +115,7 @@ index f9760b6..822c912 100644
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
new file mode 100644
index 0000000..f157de8
index 0000000..b86bf9c
--- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +1,139 @@
@ -178,8 +178,8 @@ index 0000000..f157de8
+
+ commands = new HashMap<String, Command>();
+
+ version = getInt( "config-version", 10 );
+ set( "config-version", 10 );
+ version = getInt( "config-version", 11 );
+ set( "config-version", 11 );
+ readConfig( SpigotConfig.class, null );
+ }
+

46
CraftBukkit-Patches/0024-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From 9a8e3b172cf5d871c487156daa3642e867e30166 Mon Sep 17 00:00:00 2001
From b7329e4b46dc0a657ccefba1c19f2ef9e29b8afb 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,10 +6,23 @@ Subject: [PATCH] Hopper Customisations
Allows editing hopper cooldowns and amount transferred per tick.
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index 7dfdfe9..84c1aa1 100644
index 7dfdfe9..f8c2681 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -135,12 +135,11 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -115,7 +115,11 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
this.g = this.world.getTime();
if (!this.J()) {
this.setCooldown(0);
- this.o();
+ // Spigot start
+ if (!this.o() && this.world.spigotConfig.hopperCheck > 1) {
+ this.setCooldown(this.world.spigotConfig.hopperCheck);
+ }
+ // Spigot end
}
}
@@ -135,12 +139,11 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
}
if (flag) {
@ -23,7 +36,7 @@ index 7dfdfe9..84c1aa1 100644
return false;
} else {
return false;
@@ -200,7 +199,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -200,7 +203,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
// ItemStack itemstack1 = addItem(this, iinventory, this.splitStack(i, 1), enumdirection);
// CraftBukkit start - Call event when pushing items into other inventories
@ -32,7 +45,7 @@ index 7dfdfe9..84c1aa1 100644
Inventory destinationInventory;
// Have to special case large chests as they work oddly
@@ -214,9 +213,10 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -214,9 +217,10 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
this.getWorld().getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
this.setItem(i, itemstack);
@ -44,7 +57,7 @@ index 7dfdfe9..84c1aa1 100644
ItemStack itemstack1 = addItem(this, iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
if (itemstack1.isEmpty()) {
@@ -229,6 +229,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -229,6 +233,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
return true;
}
@ -52,7 +65,7 @@ index 7dfdfe9..84c1aa1 100644
this.setItem(i, itemstack);
}
}
@@ -349,7 +350,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -349,7 +354,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
ItemStack itemstack1 = itemstack.cloneItemStack();
// ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.splitStack(i, 1), (EnumDirection) null);
// CraftBukkit start - Call event on collection of items from inventories into the hopper
@ -61,7 +74,7 @@ index 7dfdfe9..84c1aa1 100644
Inventory sourceInventory;
// Have to special case large chests as they work oddly
@@ -366,13 +367,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -366,13 +371,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
iinventory.setItem(i, itemstack1);
if (ihopper instanceof TileEntityHopper) {
@ -78,7 +91,7 @@ index 7dfdfe9..84c1aa1 100644
ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
if (itemstack2.isEmpty()) {
@@ -385,6 +386,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -385,6 +390,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
return true;
}
@ -86,7 +99,7 @@ index 7dfdfe9..84c1aa1 100644
iinventory.setItem(i, itemstack1);
}
@@ -480,7 +482,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -480,7 +486,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
}
}
@ -96,10 +109,10 @@ index 7dfdfe9..84c1aa1 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index e4a364b..120631b 100644
index e4a364b..2847bbf 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -166,4 +166,19 @@ public class SpigotWorldConfig
@@ -166,4 +166,20 @@ public class SpigotWorldConfig
otherTrackingRange = getInt( "entity-tracking-range.other", otherTrackingRange );
log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + otherTrackingRange );
}
@ -111,10 +124,11 @@ index e4a364b..120631b 100644
+ {
+ // Set the tick delay between hopper item movements
+ hopperTransfer = getInt( "ticks-per.hopper-transfer", 8 );
+ // Set the tick delay between checking for items after the associated
+ // container is empty. Default to the hopperTransfer value to prevent
+ // hopper sorting machines from becoming out of sync.
+ hopperCheck = getInt( "ticks-per.hopper-check", hopperTransfer );
+ if ( SpigotConfig.version < 11 )
+ {
+ set( "ticks-per.hopper-check", 1 );
+ }
+ hopperCheck = getInt( "ticks-per.hopper-check", 1 );
+ hopperAmount = getInt( "hopper-amount", 1 );
+ log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck + " Hopper Amount: " + hopperAmount );
+ }

6
CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
View file

@ -1,4 +1,4 @@
From af3a534ebe3fd3086e2edbae1ea7e56630c6b2b9 Mon Sep 17 00:00:00 2001
From 1c4e6f88abf96e25eea735c73316269ba915809a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -31,10 +31,10 @@ index 0990ddb..06c2733 100644
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
int j = MathHelper.floor(entityhuman.locX) + this.random.nextInt(11) - 5;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 120631b..321238c 100644
index 2847bbf..0202eeb 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -181,4 +181,11 @@ public class SpigotWorldConfig
@@ -182,4 +182,11 @@ public class SpigotWorldConfig
hopperAmount = getInt( "hopper-amount", 1 );
log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck + " Hopper Amount: " + hopperAmount );
}

6
CraftBukkit-Patches/0038-Allow-Disabling-of-1.6.3-Structure-Saving.patch
View file

@ -1,4 +1,4 @@
From b27ff77e3de923adc942c3aa29c24d6ad3a72a77 Mon Sep 17 00:00:00 2001
From cbf5e8c1b694ff2c9d91b2c9b107b1b351638eb7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 21 Sep 2013 12:33:09 +1000
Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving
@ -24,10 +24,10 @@ index 0aaf72f..761e074 100644
this.a = new PersistentStructure(this.a());
world.a(this.a(), (PersistentBase) this.a);
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 321238c..1324797 100644
index 0202eeb..1bdcd8e 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -188,4 +188,16 @@ public class SpigotWorldConfig
@@ -189,4 +189,16 @@ public class SpigotWorldConfig
randomLightUpdates = getBoolean( "random-light-updates", false );
log( "Random Lighting Updates: " + randomLightUpdates );
}

8
CraftBukkit-Patches/0041-Arrow-Despawn-Rate.patch
View file

@ -1,11 +1,11 @@
From 413e7e8f3cb8d97802defb0af85fb8086c830ac1 Mon Sep 17 00:00:00 2001
From 27d007b776b4a6ac1b32d8dcf28aadc6c0c8f294 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 14 Oct 2013 19:20:10 +1100
Subject: [PATCH] Arrow Despawn Rate
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index b47bc90..ca84d92 100644
index c7eda46..65689f2 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -18,10 +18,10 @@ index b47bc90..ca84d92 100644
}
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 1324797..5548d3e 100644
index 1bdcd8e..bdb7bed 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -200,4 +200,11 @@ public class SpigotWorldConfig
@@ -201,4 +201,11 @@ public class SpigotWorldConfig
log( "*** WARNING *** Please use this option with caution, SpigotMC is not responsible for any issues this option may cause in the future!" );
}
}

6
CraftBukkit-Patches/0047-Allow-Disabling-Zombie-Villager-Aggression.patch
View file

@ -1,4 +1,4 @@
From 155d4087b608ba3e7a9b1fec60a8f53f28cfa3bb Mon Sep 17 00:00:00 2001
From cad50acaa0a15b3b66a8f9baa971f653d379b53a Mon Sep 17 00:00:00 2001
From: Dylan Xaldin <Puremin0rez515@gmail.com>
Date: Thu, 12 Dec 2013 18:05:03 -0600
Subject: [PATCH] Allow Disabling Zombie Villager Aggression
@ -19,10 +19,10 @@ index 0cce37b..497d559 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 5548d3e..f9c01cb 100644
index bdb7bed..4276472 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -207,4 +207,11 @@ public class SpigotWorldConfig
@@ -208,4 +208,11 @@ public class SpigotWorldConfig
arrowDespawnRate = getInt( "arrow-despawn-rate", 1200 );
log( "Arrow Despawn Rate: " + arrowDespawnRate );
}

6
CraftBukkit-Patches/0051-Particle-API.patch
View file

@ -1,4 +1,4 @@
From 4e081ccb09d3265172101c30763872b8de1598da Mon Sep 17 00:00:00 2001
From e4f59c2e9f3df18203ce58b170a7621be2535419 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -19,7 +19,7 @@ index 1672183..352ff3a 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5c59f0d..e5729d0 100644
index abf1cb3..e1dd8a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -831,28 +831,18 @@ public class CraftWorld implements World {
@ -60,7 +60,7 @@ index 5c59f0d..e5729d0 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1551,6 +1541,70 @@ public class CraftWorld implements World {
@@ -1552,6 +1542,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{

8
CraftBukkit-Patches/0053-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View file

@ -1,11 +1,11 @@
From fa2f77b90ada11ac5664036bf29f3f966d7e5d07 Mon Sep 17 00:00:00 2001
From edd1aca64907e69b30249219419c4ec77d7acdb2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Feb 2014 16:55:46 +0000
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 42c3a67..ba36c19 100644
index 8893a98..252df28 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -150,6 +150,7 @@ public abstract class Entity implements ICommandListener {
@ -52,10 +52,10 @@ index 1bd3d24..c0e703c 100644
world.triggerEffect(2004, blockposition, 0);
if (entityinsentient != null) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index f9c01cb..09a02cc 100644
index 4276472..e5e54f7 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -214,4 +214,11 @@ public class SpigotWorldConfig
@@ -215,4 +215,11 @@ public class SpigotWorldConfig
zombieAggressiveTowardsVillager = getBoolean( "zombie-aggressive-towards-villager", true );
log( "Zombie Aggressive Towards Villager: " + zombieAggressiveTowardsVillager );
}

6
CraftBukkit-Patches/0061-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
View file

@ -1,4 +1,4 @@
From 14eeab38ca3c86ea93302d8880eba6d7871c026b Mon Sep 17 00:00:00 2001
From 0087bb44a553684360b24ca3e6a106a84411704b Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
@ -18,10 +18,10 @@ index a9eb731..857ae9d 100644
BlockPosition blockposition1;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 09a02cc..0c7d958 100644
index e5e54f7..c08b4a6 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -221,4 +221,11 @@ public class SpigotWorldConfig
@@ -222,4 +222,11 @@ public class SpigotWorldConfig
nerfSpawnerMobs = getBoolean( "nerf-spawner-mobs", false );
log( "Nerfing mobs spawned from spawners: " + nerfSpawnerMobs );
}

6
CraftBukkit-Patches/0073-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 8396ca419e2385521253ac4d7ef4b47784c14694 Mon Sep 17 00:00:00 2001
From dac2a4ad5d19476355099c904cdbf5e5f81fe25a Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -40,10 +40,10 @@ index 37780ac..275582a 100644
// this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dv, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index cc08ec6..cf1a2e6 100644
index 50d8948..d843672 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1610,6 +1610,22 @@ public class CraftWorld implements World {
@@ -1611,6 +1611,22 @@ public class CraftWorld implements World {
{
CraftWorld.this.playEffect( location, effect, 0 );
}

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

@ -1,14 +1,14 @@
From 574938efd79eef08994e9931ec2b5b7ee9bdb9f7 Mon Sep 17 00:00:00 2001
From 52fd4d3941161bffc549056e006a29d0e66d9857 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/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index 84c1aa1..f12bc70 100644
index f8c2681..6acce15 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -513,6 +513,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -517,6 +517,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
int j = MathHelper.floor(d1);
int k = MathHelper.floor(d2);
BlockPosition blockposition = new BlockPosition(i, j, k);

6
CraftBukkit-Patches/0080-Configurable-dragon-death-and-wither-spawn-sounds.patch
View file

@ -1,4 +1,4 @@
From be77d2d6120debf52d47c19adacc94f8f0e88e47 Mon Sep 17 00:00:00 2001
From 0b2b35ebc89f6fee44ba529af6f0cd45f0b9e0ee Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 29 Mar 2014 13:44:25 -0400
Subject: [PATCH] Configurable dragon death and wither spawn sounds
@ -47,10 +47,10 @@ index 5d22e5f..9af34ba 100644
double deltaLength = Math.sqrt(distanceSquared);
double relativeX = player.locX + (deltaX / deltaLength) * viewDistance;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 0c7d958..fe57af7 100644
index c08b4a6..66f4d8f 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -228,4 +228,16 @@ public class SpigotWorldConfig
@@ -229,4 +229,16 @@ public class SpigotWorldConfig
enableZombiePigmenPortalSpawns = getBoolean( "enable-zombie-pigmen-portal-spawns", true );
log( "Allow Zombie Pigmen to spawn from portal blocks: " + enableZombiePigmenPortalSpawns );
}

6
CraftBukkit-Patches/0107-Further-Seed-Customisation.patch
View file

@ -1,4 +1,4 @@
From 7748d751d16a13fa20b808ff5c85c27b6998d131 Mon Sep 17 00:00:00 2001
From d9e8182ef51f612e68cd7b7594095f2e21fa34db Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 4 Jul 2014 13:28:45 +1000
Subject: [PATCH] Further Seed Customisation
@ -76,10 +76,10 @@ index 11a6ef7..fd82756 100644
i1 *= this.d;
j1 *= this.d;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index fe57af7..d89eab1 100644
index 66f4d8f..4e55284 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -240,4 +240,17 @@ public class SpigotWorldConfig
@@ -241,4 +241,17 @@ public class SpigotWorldConfig
{
witherSpawnSoundRadius = getInt( "wither-spawn-sound-radius", 0 );
}

8
CraftBukkit-Patches/0113-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View file

@ -1,11 +1,11 @@
From ed34f3055a9ff9d045718e697f0de9944b4149d7 Mon Sep 17 00:00:00 2001
From 02965242631efe3782575dfc691512caf16a1261 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index 1c2bf8e..76dc92a 100644
index d6b1d12..4a6e2a1 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -8,6 +8,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -26,10 +26,10 @@ index 1c2bf8e..76dc92a 100644
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index cf1a2e6..a15c129 100644
index d843672..822d73b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1170,6 +1170,12 @@ public class CraftWorld implements World {
@@ -1171,6 +1171,12 @@ public class CraftWorld implements World {
}
if (entity != null) {

6
CraftBukkit-Patches/0125-Add-Hunger-Config-Values.patch
View file

@ -1,4 +1,4 @@
From bf6f0ffbbe3dcc5dbaa0c8dbb82dbb7fce20e223 Mon Sep 17 00:00:00 2001
From 19dac90dbdf3de75de6ec33ae733d5b33b0172db Mon Sep 17 00:00:00 2001
From: lazertester <austin.techhead@gmail.com>
Date: Sun, 17 Aug 2014 19:56:17 +1000
Subject: [PATCH] Add Hunger Config Values
@ -76,10 +76,10 @@ index b5fd8e8..b6e9786 100644
}
} else if (this.foodLevel <= 0) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index d89eab1..24c46c4 100644
index 4e55284..d5d7ef7 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -253,4 +253,30 @@ public class SpigotWorldConfig
@@ -254,4 +254,30 @@ public class SpigotWorldConfig
slimeSeed = getInt( "seed-slime", 987234911 );
log( "Custom Map Seeds: Village: " + villageSeed + " Feature: " + largeFeatureSeed + "Monument: " + monumentSeed + " Slime: " + slimeSeed );
}

6
CraftBukkit-Patches/0128-Limit-TNT-Detonations-per-tick.patch
View file

@ -1,4 +1,4 @@
From ce2d611fb7e05cb99630b499abf1824e8948132d Mon Sep 17 00:00:00 2001
From a4ad3ec2075d25bb8cadabef84cc801e371c93b1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick
@ -31,10 +31,10 @@ index e960453..8893842 100644
protected void l() {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 24c46c4..92e7428 100644
index d5d7ef7..8cb0768 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -279,4 +279,15 @@ public class SpigotWorldConfig
@@ -280,4 +280,15 @@ public class SpigotWorldConfig
sprintMultiplier = (float) getDouble( "hunger.sprint-multiplier", 0.1 );
otherMultiplier = (float) getDouble( "hunger.other-multiplier", 0.0 );
}

6
CraftBukkit-Patches/0130-Configurable-Hanging-Tick.patch
View file

@ -1,4 +1,4 @@
From 5a61afff64a5756ac535a66ff75971acab4e8590 Mon Sep 17 00:00:00 2001
From fd6e78482e44242be92f4d7ca5b88e738e498fc0 Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Sat, 9 Aug 2014 13:56:51 -0400
Subject: [PATCH] Configurable Hanging Tick
@ -18,10 +18,10 @@ index b1202ce..17dff60 100644
if (!this.dead && !this.survives()) {
// CraftBukkit start - fire break events
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 92e7428..6d9489c 100644
index 8cb0768..48ac741 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -290,4 +290,10 @@ public class SpigotWorldConfig
@@ -291,4 +291,10 @@ public class SpigotWorldConfig
maxTntTicksPerTick = getInt( "max-tnt-per-tick", 100 );
log( "Max TNT Explosions: " + maxTntTicksPerTick );
}

6
CraftBukkit-Patches/0134-Allow-Capping-Tile-Entity-Tick-Time.patch
View file

@ -1,4 +1,4 @@
From ec87c25322f1f515fba39d949fc935470433fd5b Mon Sep 17 00:00:00 2001
From 8179bd19433d543ea344cf99f8c257fa129bbbc4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 20 Feb 2015 21:39:31 +1100
Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.
@ -82,10 +82,10 @@ index 17ea24c..d7cc8b6 100644
if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 6d9489c..ca6e9c8 100644
index 48ac741..9a4a73c 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -296,4 +296,13 @@ public class SpigotWorldConfig
@@ -297,4 +297,13 @@ public class SpigotWorldConfig
{
hangingTickFrequency = getInt( "hanging-tick-frequency", 100 );
}