Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 14:33:56 +01:00
Code Issues Projects Releases Wiki Activity

Compiling up to patch 10

Browse Source
This commit is contained in:
md_5 2013-06-21 17:00:01 +10:00
parent d98522c69d
commit 8cbfcf995d
5 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 1f73a2aab42801c0755013847e2e01944aea94ca Mon Sep 17 00:00:00 2001 From 2dd1e832500d42db77b2e7f905e6d2c7287ed664 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:34:54 +1000 Date: Tue, 23 Apr 2013 11:34:54 +1000
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -114,6 +114,19 @@ index 4ead01e..8c9f66b 100644
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6cb50b7..00326c1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -208,7 +208,7 @@ public final class CraftServer implements Server {
chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
- updater.setEnabled(configuration.getBoolean("auto-updater.enabled"));
+ updater.setEnabled(false); // Spigot
updater.setSuggestChannels(configuration.getBoolean("auto-updater.suggest-channels"));
updater.getOnBroken().addAll(configuration.getStringList("auto-updater.on-broken"));
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index f905d17..9304637 100644 index f905d17..9304637 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java

12
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View File

@ -1,4 +1,4 @@
From f1b9716fd4c673cd0074121a4084fcf1cdc3137b Mon Sep 17 00:00:00 2001 From 0abff71f90ac188f2bc11f81faa224f58179f1c8 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 20 Jun 2013 17:35:57 +1000 Date: Thu, 20 Jun 2013 17:35:57 +1000
Subject: [PATCH] Spigot Configuration Subject: [PATCH] Spigot Configuration
@ -142,10 +142,10 @@ index 0000000..bf297bc
+} +}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
new file mode 100644 new file mode 100644
index 0000000..7d3ec55 index 0000000..6642e86
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -0,0 +1,57 @@ @@ -0,0 +1,63 @@
+package org.spigotmc; +package org.spigotmc;
+ +
+import java.util.List; +import java.util.List;
@ -185,6 +185,12 @@ index 0000000..7d3ec55
+ return config.getBoolean( "world-settings." + worldName + "." + path, config.getBoolean( "world-settings.default." + path ) ); + return config.getBoolean( "world-settings." + worldName + "." + path, config.getBoolean( "world-settings.default." + path ) );
+ } + }
+ +
+ private double getDouble(String path, double def)
+ {
+ config.addDefault( "world-settings.default." + path, def );
+ return config.getDouble("world-settings." + worldName + "." + path, config.getDouble("world-settings.default." + path ) );
+ }
+
+ private int getInt(String path, int def) + private int getInt(String path, int def)
+ { + {
+ config.addDefault( "world-settings.default." + path, def ); + config.addDefault( "world-settings.default." + path, def );

10
CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
View File

@ -1,4 +1,4 @@
From 1abb83644de1706b96b50f0497854ecc1f228a12 Mon Sep 17 00:00:00 2001 From 0f73824e729e0ec4ea129df7f583f6183600a79d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000 Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection Subject: [PATCH] Better Chunk Tick Selection
@ -148,18 +148,18 @@ index 49360c1..6c3fcf1 100644
} }
} }
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 7d3ec55..4e1bdcf 100644 index 6642e86..2b77e04 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -54,4 +54,11 @@ public class SpigotWorldConfig @@ -60,4 +60,11 @@ public class SpigotWorldConfig
config.addDefault( "world-settings.default." + path, def ); config.addDefault( "world-settings.default." + path, def );
return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
} }
+ +
+ public int chunksPerTick = 750; + public int chunksPerTick;
+ private void chunksPerTick() + private void chunksPerTick()
+ { + {
+ chunksPerTick = getInt( "chunks-per-tick", chunksPerTick ); + chunksPerTick = getInt( "chunks-per-tick", 650 );
+ log( "Chunks to Grow per Tick: " + chunksPerTick ); + log( "Chunks to Grow per Tick: " + chunksPerTick );
+ } + }
} }

36
CraftBukkit-Patches/0006-Crop-Growth-Rates.patch
View File

@ -1,4 +1,4 @@
From 77958016c76679e58d9475984109f0ec9830ceee Mon Sep 17 00:00:00 2001 From afa1480e9b476323793c4f04de60114b6c1714c9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 16:44:14 +1000 Date: Fri, 21 Jun 2013 16:44:14 +1000
Subject: [PATCH] Crop Growth Rates Subject: [PATCH] Crop Growth Rates
@ -171,43 +171,43 @@ index bf297bc..38bd7ba 100644
} }
} }
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 4e1bdcf..8954c99 100644 index 2b77e04..fcc2c88 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -61,4 +61,36 @@ public class SpigotWorldConfig @@ -67,4 +67,36 @@ public class SpigotWorldConfig
chunksPerTick = getInt( "chunks-per-tick", chunksPerTick ); chunksPerTick = getInt( "chunks-per-tick", 650 );
log( "Chunks to Grow per Tick: " + chunksPerTick ); log( "Chunks to Grow per Tick: " + chunksPerTick );
} }
+ +
+ // Crop growth rates + // Crop growth rates
+ public int cactusModifier = 100; + public int cactusModifier;
+ public int caneModifier = 100; + public int caneModifier;
+ public int melonModifier = 100; + public int melonModifier;
+ public int mushroomModifier = 100; + public int mushroomModifier;
+ public int pumpkinModifier = 100; + public int pumpkinModifier;
+ public int saplingModifier = 100; + public int saplingModifier;
+ public int wheatModifier = 100; + public int wheatModifier;
+ private void growthModifiers() + private void growthModifiers()
+ { + {
+ cactusModifier = getInt( "growth.cactus-modifier", cactusModifier ); + cactusModifier = getInt( "growth.cactus-modifier", 100 );
+ log( "Cactus Growth Modifier: " + cactusModifier + "%" ); + log( "Cactus Growth Modifier: " + cactusModifier + "%" );
+ +
+ caneModifier = getInt( "growth.cane-modifier", caneModifier ); + caneModifier = getInt( "growth.cane-modifier", 100 );
+ log( "Cactus Growth Modifier: " + cactusModifier + "%" ); + log( "Cactus Growth Modifier: " + cactusModifier + "%" );
+ +
+ melonModifier = getInt( "growth.melon-modifier", melonModifier ); + melonModifier = getInt( "growth.melon-modifier", 100 );
+ log( "Cactus Growth Modifier: " + cactusModifier + "%" ); + log( "Cactus Growth Modifier: " + cactusModifier + "%" );
+ +
+ mushroomModifier = getInt( "growth.mushroom-modifier", mushroomModifier ); + mushroomModifier = getInt( "growth.mushroom-modifier", 100 );
+ log( "Cactus Growth Modifier: " + cactusModifier + "%" ); + log( "Cactus Growth Modifier: " + cactusModifier + "%" );
+ +
+ pumpkinModifier = getInt( "growth.pumpkin-modifier", pumpkinModifier ); + pumpkinModifier = getInt( "growth.pumpkin-modifier", 100 );
+ log( "Cactus Growth Modifier: " + cactusModifier + "%" ); + log( "Cactus Growth Modifier: " + cactusModifier + "%" );
+ +
+ saplingModifier = getInt( "growth.sapling-modifier", saplingModifier ); + saplingModifier = getInt( "growth.sapling-modifier", 100 );
+ log( "Cactus Growth Modifier: " + cactusModifier + "%" ); + log( "Cactus Growth Modifier: " + cactusModifier + "%" );
+ +
+ wheatModifier = getInt( "growth.wheat-modifier", wheatModifier ); + wheatModifier = getInt( "growth.wheat-modifier", 100 );
+ log( "Cactus Growth Modifier: " + cactusModifier + "%" ); + log( "Cactus Growth Modifier: " + cactusModifier + "%" );
+ } + }
} }

22
CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch
View File

@ -1,4 +1,4 @@
From 9ce8fe366d6c6f3fb6d9f358782bd67f7286f869 Mon Sep 17 00:00:00 2001 From b602c4203e83e437284f7716e1b6535e22a3af2b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100 Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration Subject: [PATCH] Merge tweaks and configuration
@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players. This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 0225f53..67567fa 100644 index 0225f53..048e8fa 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java --- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -114,7 +114,10 @@ public class EntityItem extends Entity { @@ -114,7 +114,10 @@ public class EntityItem extends Entity {
@ -15,7 +15,7 @@ index 0225f53..67567fa 100644
private void g() { private void g() {
- Iterator iterator = this.world.a(EntityItem.class, this.boundingBox.grow(0.5D, 0.0D, 0.5D)).iterator(); - Iterator iterator = this.world.a(EntityItem.class, this.boundingBox.grow(0.5D, 0.0D, 0.5D)).iterator();
+ // Spigot start + // Spigot start
+ float radius = world.spigotConfig.itemMerge; + double radius = world.spigotConfig.itemMerge;
+ Iterator iterator = this.world.a(EntityItem.class, this.boundingBox.grow(radius, radius, radius)).iterator(); + Iterator iterator = this.world.a(EntityItem.class, this.boundingBox.grow(radius, radius, radius)).iterator();
+ // Spigot end + // Spigot end
@ -41,7 +41,7 @@ index 0225f53..67567fa 100644
} }
} else { } else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index afe3e4d..d7e5301 100644 index afe3e4d..97da2cd 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -957,6 +957,23 @@ public abstract class World implements IBlockAccess { @@ -957,6 +957,23 @@ public abstract class World implements IBlockAccess {
@ -51,7 +51,7 @@ index afe3e4d..d7e5301 100644
+ // Spigot start + // Spigot start
+ else if (entity instanceof EntityExperienceOrb) { + else if (entity instanceof EntityExperienceOrb) {
+ EntityExperienceOrb xp = (EntityExperienceOrb) entity; + EntityExperienceOrb xp = (EntityExperienceOrb) entity;
+ float radius = spigotConfig.expMerge; + double radius = spigotConfig.expMerge;
+ if (radius > 0) { + if (radius > 0) {
+ List<Entity> entities = this.getEntities(entity, entity.boundingBox.grow(radius, radius, radius)); + List<Entity> entities = this.getEntities(entity, entity.boundingBox.grow(radius, radius, radius));
+ for (Entity e : entities) { + for (Entity e : entities) {
@ -69,25 +69,25 @@ index afe3e4d..d7e5301 100644
if (event != null && (event.isCancelled() || entity.dead)) { if (event != null && (event.isCancelled() || entity.dead)) {
entity.dead = true; entity.dead = true;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 8954c99..799bbc8 100644 index 899f86c..1101361 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -93,4 +93,18 @@ public class SpigotWorldConfig @@ -99,4 +99,18 @@ public class SpigotWorldConfig
wheatModifier = getInt( "growth.wheat-modifier", wheatModifier ); wheatModifier = getInt( "growth.wheat-modifier", wheatModifier );
log( "Cactus Growth Modifier: " + cactusModifier + "%" ); log( "Cactus Growth Modifier: " + cactusModifier + "%" );
} }
+ +
+ public float itemMerge = 2.5F; + public double itemMerge;
+ private void itemMerge() + private void itemMerge()
+ { + {
+ itemMerge = getFloat( "merge-radius.item", itemMerge ); + itemMerge = getDouble("merge-radius.item", 2.5 );
+ log( "Item Merge Radius: " + itemMerge ); + log( "Item Merge Radius: " + itemMerge );
+ } + }
+ +
+ public float expMerge = 3.0F; + public double expMerge;
+ private void expMerge() + private void expMerge()
+ { + {
+ expMerge = getFloat( "merge-radius.exp", expMerge ); + expMerge = getDouble("merge-radius.exp", 3.0 );
+ log( "Experience Merge Radius: " + expMerge ); + log( "Experience Merge Radius: " + expMerge );
+ } + }
} }