diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 2c26b16..36115e5 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From f7640e664a50266869f5ecf8a687540d82ea7966 Mon Sep 17 00:00:00 2001 +From f0bf2e0a92d542e6d723b1d449766205fd4cb5b7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 6 Jan 2015 22:12:31 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index f0ceea5..0fcecd9 100644 +index cb142f2..bc6964d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,18 +4,18 @@ @@ -24,7 +24,7 @@ index f0ceea5..0fcecd9 100644 - spigot-api + org.github.paperspigot + paperspigot-api - 1.8.7-R0.1-SNAPSHOT + 1.8.8-R0.1-SNAPSHOT jar - Spigot-API @@ -35,5 +35,5 @@ index f0ceea5..0fcecd9 100644 -- -1.9.5.msysgit.1 +2.4.5.windows.1 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 8966c12..715a59b 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 9f2870448d2ab27847088519c6b674d01076192c Mon Sep 17 00:00:00 2001 +From 7e24ff0f3820b76c0efc2b02737e1f193f4ba74a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 19 Mar 2015 19:41:15 -0500 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 0e0fd09..bc0a4a6 100644 +index 91627ff..9678b08 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -17,7 +17,7 @@ index 0e0fd09..bc0a4a6 100644 + org.github.paperspigot + paperspigot jar - 1.8.7-R0.1-SNAPSHOT + 1.8.8-R0.1-SNAPSHOT - Spigot - http://www.spigotmc.org + PaperSpigot @@ -85,5 +85,5 @@ index 9304637..3a4b142 100644 if (stream != null) { -- -1.9.5.msysgit.1 +2.4.5.windows.1 diff --git a/Spigot-Server-Patches/0003-mc-dev-imports.patch b/Spigot-Server-Patches/0003-mc-dev-imports.patch index fae393c..e921bb0 100644 --- a/Spigot-Server-Patches/0003-mc-dev-imports.patch +++ b/Spigot-Server-Patches/0003-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From ee1f272094607998cf0e87fe3e4678f7364ec5e1 Mon Sep 17 00:00:00 2001 +From e2c366725b828d0faaa28cafe8415936aeec51ef Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 25 May 2015 15:37:00 -0500 Subject: [PATCH] mc-dev imports @@ -6,40 +6,39 @@ Subject: [PATCH] mc-dev imports diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java new file mode 100644 -index 0000000..f56a035 +index 0000000..b1ae67a --- /dev/null +++ b/src/main/java/net/minecraft/server/BiomeBase.java -@@ -0,0 +1,490 @@ +@@ -0,0 +1,489 @@ +package net.minecraft.server; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; -+import org.apache.logging.log4j.LogManager; -+import org.apache.logging.log4j.Logger; -+ +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; ++import org.apache.logging.log4j.LogManager; ++import org.apache.logging.log4j.Logger; + +public abstract class BiomeBase { + + private static final Logger aD = LogManager.getLogger(); -+ protected static final BiomeBase.BiomeTemperature a = new BiomeBase.BiomeTemperature(0.1F, 0.2F); -+ protected static final BiomeBase.BiomeTemperature b = new BiomeBase.BiomeTemperature(-0.5F, 0.0F); -+ protected static final BiomeBase.BiomeTemperature c = new BiomeBase.BiomeTemperature(-1.0F, 0.1F); -+ protected static final BiomeBase.BiomeTemperature d = new BiomeBase.BiomeTemperature(-1.8F, 0.1F); -+ protected static final BiomeBase.BiomeTemperature e = new BiomeBase.BiomeTemperature(0.125F, 0.05F); -+ protected static final BiomeBase.BiomeTemperature f = new BiomeBase.BiomeTemperature(0.2F, 0.2F); -+ protected static final BiomeBase.BiomeTemperature g = new BiomeBase.BiomeTemperature(0.45F, 0.3F); -+ protected static final BiomeBase.BiomeTemperature h = new BiomeBase.BiomeTemperature(1.5F, 0.025F); -+ protected static final BiomeBase.BiomeTemperature i = new BiomeBase.BiomeTemperature(1.0F, 0.5F); -+ protected static final BiomeBase.BiomeTemperature j = new BiomeBase.BiomeTemperature(0.0F, 0.025F); -+ protected static final BiomeBase.BiomeTemperature k = new BiomeBase.BiomeTemperature(0.1F, 0.8F); -+ protected static final BiomeBase.BiomeTemperature l = new BiomeBase.BiomeTemperature(0.2F, 0.3F); -+ protected static final BiomeBase.BiomeTemperature m = new BiomeBase.BiomeTemperature(-0.2F, 0.1F); ++ protected static final BiomeTemperature a = new BiomeTemperature(0.1F, 0.2F); ++ protected static final BiomeTemperature b = new BiomeTemperature(-0.5F, 0.0F); ++ protected static final BiomeTemperature c = new BiomeTemperature(-1.0F, 0.1F); ++ protected static final BiomeTemperature d = new BiomeTemperature(-1.8F, 0.1F); ++ protected static final BiomeTemperature e = new BiomeTemperature(0.125F, 0.05F); ++ protected static final BiomeTemperature f = new BiomeTemperature(0.2F, 0.2F); ++ protected static final BiomeTemperature g = new BiomeTemperature(0.45F, 0.3F); ++ protected static final BiomeTemperature h = new BiomeTemperature(1.5F, 0.025F); ++ protected static final BiomeTemperature i = new BiomeTemperature(1.0F, 0.5F); ++ protected static final BiomeTemperature j = new BiomeTemperature(0.0F, 0.025F); ++ protected static final BiomeTemperature k = new BiomeTemperature(0.1F, 0.8F); ++ protected static final BiomeTemperature l = new BiomeTemperature(0.2F, 0.3F); ++ protected static final BiomeTemperature m = new BiomeTemperature(-0.2F, 0.1F); + private static final BiomeBase[] biomes = new BiomeBase[256]; + public static final Set n = Sets.newHashSet(); + public static final Map o = Maps.newHashMap(); @@ -130,20 +129,20 @@ index 0000000..f56a035 + this.id = i; + BiomeBase.biomes[i] = this; + this.as = this.a(); -+ this.au.add(new BiomeBase.BiomeMeta(EntitySheep.class, 12, 4, 4)); -+ this.au.add(new BiomeBase.BiomeMeta(EntityRabbit.class, 10, 3, 3)); -+ this.au.add(new BiomeBase.BiomeMeta(EntityPig.class, 10, 4, 4)); -+ this.au.add(new BiomeBase.BiomeMeta(EntityChicken.class, 10, 4, 4)); -+ this.au.add(new BiomeBase.BiomeMeta(EntityCow.class, 8, 4, 4)); -+ this.at.add(new BiomeBase.BiomeMeta(EntitySpider.class, 100, 4, 4)); -+ this.at.add(new BiomeBase.BiomeMeta(EntityZombie.class, 100, 4, 4)); -+ this.at.add(new BiomeBase.BiomeMeta(EntitySkeleton.class, 100, 4, 4)); -+ this.at.add(new BiomeBase.BiomeMeta(EntityCreeper.class, 100, 4, 4)); -+ this.at.add(new BiomeBase.BiomeMeta(EntitySlime.class, 100, 4, 4)); -+ this.at.add(new BiomeBase.BiomeMeta(EntityEnderman.class, 10, 1, 4)); -+ this.at.add(new BiomeBase.BiomeMeta(EntityWitch.class, 5, 1, 1)); -+ this.av.add(new BiomeBase.BiomeMeta(EntitySquid.class, 10, 4, 4)); -+ this.aw.add(new BiomeBase.BiomeMeta(EntityBat.class, 10, 8, 8)); ++ this.au.add(new BiomeMeta(EntitySheep.class, 12, 4, 4)); ++ this.au.add(new BiomeMeta(EntityRabbit.class, 10, 3, 3)); ++ this.au.add(new BiomeMeta(EntityPig.class, 10, 4, 4)); ++ this.au.add(new BiomeMeta(EntityChicken.class, 10, 4, 4)); ++ this.au.add(new BiomeMeta(EntityCow.class, 8, 4, 4)); ++ this.at.add(new BiomeMeta(EntitySpider.class, 100, 4, 4)); ++ this.at.add(new BiomeMeta(EntityZombie.class, 100, 4, 4)); ++ this.at.add(new BiomeMeta(EntitySkeleton.class, 100, 4, 4)); ++ this.at.add(new BiomeMeta(EntityCreeper.class, 100, 4, 4)); ++ this.at.add(new BiomeMeta(EntitySlime.class, 100, 4, 4)); ++ this.at.add(new BiomeMeta(EntityEnderman.class, 10, 1, 4)); ++ this.at.add(new BiomeMeta(EntityWitch.class, 5, 1, 1)); ++ this.av.add(new BiomeMeta(EntitySquid.class, 10, 4, 4)); ++ this.aw.add(new BiomeMeta(EntityBat.class, 10, 8, 8)); + } + + protected BiomeDecorator a() { @@ -160,7 +159,7 @@ index 0000000..f56a035 + } + } + -+ protected final BiomeBase a(BiomeBase.BiomeTemperature biomebase_biometemperature) { ++ protected final BiomeBase a(BiomeTemperature biomebase_biometemperature) { + this.an = biomebase_biometemperature.a; + this.ao = biomebase_biometemperature.b; + return this; @@ -220,7 +219,7 @@ index 0000000..f56a035 + } + + public List getMobs(EnumCreatureType enumcreaturetype) { -+ switch (BiomeBase.SyntheticClass_1.switchMap[enumcreaturetype.ordinal()]) { ++ switch (SyntheticClass_1.switchMap[enumcreaturetype.ordinal()]) { + case 1: + return this.at; + @@ -356,8 +355,8 @@ index 0000000..f56a035 + return biomebase == this ? true : (biomebase == null ? false : this.l() == biomebase.l()); + } + -+ public BiomeBase.EnumTemperature m() { -+ return (double) this.temperature < 0.2D ? BiomeBase.EnumTemperature.COLD : ((double) this.temperature < 1.0D ? BiomeBase.EnumTemperature.MEDIUM : BiomeBase.EnumTemperature.WARM); ++ public EnumTemperature m() { ++ return (double) this.temperature < 0.2D ? EnumTemperature.COLD : ((double) this.temperature < 1.0D ? EnumTemperature.MEDIUM : EnumTemperature.WARM); + } + + public static BiomeBase[] getBiomes() { @@ -434,25 +433,25 @@ index 0000000..f56a035 + + static { + try { -+ BiomeBase.SyntheticClass_1.switchMap[EnumCreatureType.MONSTER.ordinal()] = 1; ++ SyntheticClass_1.switchMap[EnumCreatureType.MONSTER.ordinal()] = 1; + } catch (NoSuchFieldError nosuchfielderror) { + ; + } + + try { -+ BiomeBase.SyntheticClass_1.switchMap[EnumCreatureType.CREATURE.ordinal()] = 2; ++ SyntheticClass_1.switchMap[EnumCreatureType.CREATURE.ordinal()] = 2; + } catch (NoSuchFieldError nosuchfielderror1) { + ; + } + + try { -+ BiomeBase.SyntheticClass_1.switchMap[EnumCreatureType.WATER_CREATURE.ordinal()] = 3; ++ SyntheticClass_1.switchMap[EnumCreatureType.WATER_CREATURE.ordinal()] = 3; + } catch (NoSuchFieldError nosuchfielderror2) { + ; + } + + try { -+ BiomeBase.SyntheticClass_1.switchMap[EnumCreatureType.AMBIENT.ordinal()] = 4; ++ SyntheticClass_1.switchMap[EnumCreatureType.AMBIENT.ordinal()] = 4; + } catch (NoSuchFieldError nosuchfielderror3) { + ; + } @@ -488,8 +487,8 @@ index 0000000..f56a035 + this.b = f1; + } + -+ public BiomeBase.BiomeTemperature a() { -+ return new BiomeBase.BiomeTemperature(this.a * 0.8F, this.b * 0.6F); ++ public BiomeTemperature a() { ++ return new BiomeTemperature(this.a * 0.8F, this.b * 0.6F); + } + } + @@ -853,14 +852,13 @@ index 0000000..29f8554 +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderFlat.java b/src/main/java/net/minecraft/server/ChunkProviderFlat.java new file mode 100644 -index 0000000..d340fbf +index 0000000..d1e10c6 --- /dev/null +++ b/src/main/java/net/minecraft/server/ChunkProviderFlat.java -@@ -0,0 +1,245 @@ +@@ -0,0 +1,244 @@ +package net.minecraft.server; + +import com.google.common.collect.Lists; -+ +import java.util.Iterator; +import java.util.List; +import java.util.Map; @@ -2289,5 +2287,5 @@ index 0000000..f75e2de + } +} -- -1.9.5.msysgit.1 +2.4.5.windows.1 diff --git a/Spigot-Server-Patches/0051-Generator-Settings.patch b/Spigot-Server-Patches/0051-Generator-Settings.patch index 34b25e2..3e89c09 100644 --- a/Spigot-Server-Patches/0051-Generator-Settings.patch +++ b/Spigot-Server-Patches/0051-Generator-Settings.patch @@ -1,14 +1,14 @@ -From 32809f19984bf2b2a71f35f4e4394d804c9f6c55 Mon Sep 17 00:00:00 2001 +From 34c280302d637eac20ef44556f6b3a69097a8afb Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 2 Jun 2015 00:41:23 -0700 Subject: [PATCH] Generator Settings diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index f56a035..6311107 100644 +index b1ae67a..28da136 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java -@@ -279,7 +279,7 @@ public abstract class BiomeBase { +@@ -278,7 +278,7 @@ public abstract class BiomeBase { BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); for (int l1 = 255; l1 >= 0; --l1) { @@ -31,10 +31,10 @@ index fd827f2..65cd706 100644 } else { IBlockData iblockdata2 = chunksnapshot.a(l, l1, k); diff --git a/src/main/java/net/minecraft/server/ChunkProviderFlat.java b/src/main/java/net/minecraft/server/ChunkProviderFlat.java -index d340fbf..717d3e8 100644 +index d1e10c6..b939f47 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderFlat.java +++ b/src/main/java/net/minecraft/server/ChunkProviderFlat.java -@@ -26,7 +26,7 @@ public class ChunkProviderFlat implements IChunkProvider { +@@ -25,7 +25,7 @@ public class ChunkProviderFlat implements IChunkProvider { if (flag) { Map map = this.d.b(); @@ -43,7 +43,7 @@ index d340fbf..717d3e8 100644 Map map1 = (Map) map.get("village"); if (!map1.containsKey("size")) { -@@ -36,19 +36,19 @@ public class ChunkProviderFlat implements IChunkProvider { +@@ -35,19 +35,19 @@ public class ChunkProviderFlat implements IChunkProvider { this.e.add(new WorldGenVillage(map1)); } @@ -67,7 +67,7 @@ index d340fbf..717d3e8 100644 this.e.add(new WorldGenMonument((Map) map.get("oceanmonument"))); } } -@@ -61,7 +61,7 @@ public class ChunkProviderFlat implements IChunkProvider { +@@ -60,7 +60,7 @@ public class ChunkProviderFlat implements IChunkProvider { this.i = new WorldGenLakes(Blocks.LAVA); } @@ -276,5 +276,5 @@ index e6ecaff..b9b76ce 100644 + } } -- -1.9.5.msysgit.1 +2.4.5.windows.1