twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-06 15:12:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update PaperSpigot to 1.8.8

Browse Source
This commit is contained in:
Zach Brown
2015-07-27 17:26:21 -05:00
parent 2f2cf5ae5b
commit fd378c06e5
4 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/POM-changes.patch
View File

@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <artifactId>spigot-api</artifactId> - <artifactId>spigot-api</artifactId>
+ <groupId>org.github.paperspigot</groupId> + <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot-api</artifactId> + <artifactId>paperspigot-api</artifactId>
<version>1.8.7-R0.1-SNAPSHOT</version> <version>1.8.8-R0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>Spigot-API</name> - <name>Spigot-API</name>
@@ -35,5 +35,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<properties> <properties>
-- --
1.9.5.msysgit.1

2
Spigot-Server-Patches/Generator-Settings.patch
View File

@@ -276,5 +276,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
} }
-- --
1.9.5.msysgit.1

4
Spigot-Server-Patches/POM-Changes.patch
View File

@@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ <groupId>org.github.paperspigot</groupId> + <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot</artifactId> + <artifactId>paperspigot</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.8.7-R0.1-SNAPSHOT</version> <version>1.8.8-R0.1-SNAPSHOT</version>
- <name>Spigot</name> - <name>Spigot</name>
- <url>http://www.spigotmc.org</url> - <url>http://www.spigotmc.org</url>
+ <name>PaperSpigot</name> + <name>PaperSpigot</name>
@@ -85,5 +85,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (stream != null) { if (stream != null) {
-- --
1.9.5.msysgit.1

82
Spigot-Server-Patches/mc-dev-imports.patch
View File

@@ -15,31 +15,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import com.google.common.collect.Lists; +import com.google.common.collect.Lists;
+import com.google.common.collect.Maps; +import com.google.common.collect.Maps;
+import com.google.common.collect.Sets; +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.Collections;
+import java.util.List; +import java.util.List;
+import java.util.Map; +import java.util.Map;
+import java.util.Random; +import java.util.Random;
+import java.util.Set; +import java.util.Set;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+ +
+public abstract class BiomeBase { +public abstract class BiomeBase {
+ +
+ private static final Logger aD = LogManager.getLogger(); + private static final Logger aD = LogManager.getLogger();
+ protected static final BiomeBase.BiomeTemperature a = new BiomeBase.BiomeTemperature(0.1F, 0.2F); + protected static final BiomeTemperature a = new BiomeTemperature(0.1F, 0.2F);
+ protected static final BiomeBase.BiomeTemperature b = new BiomeBase.BiomeTemperature(-0.5F, 0.0F); + protected static final BiomeTemperature b = new BiomeTemperature(-0.5F, 0.0F);
+ protected static final BiomeBase.BiomeTemperature c = new BiomeBase.BiomeTemperature(-1.0F, 0.1F); + protected static final BiomeTemperature c = new BiomeTemperature(-1.0F, 0.1F);
+ protected static final BiomeBase.BiomeTemperature d = new BiomeBase.BiomeTemperature(-1.8F, 0.1F); + protected static final BiomeTemperature d = new BiomeTemperature(-1.8F, 0.1F);
+ protected static final BiomeBase.BiomeTemperature e = new BiomeBase.BiomeTemperature(0.125F, 0.05F); + protected static final BiomeTemperature e = new BiomeTemperature(0.125F, 0.05F);
+ protected static final BiomeBase.BiomeTemperature f = new BiomeBase.BiomeTemperature(0.2F, 0.2F); + protected static final BiomeTemperature f = new BiomeTemperature(0.2F, 0.2F);
+ protected static final BiomeBase.BiomeTemperature g = new BiomeBase.BiomeTemperature(0.45F, 0.3F); + protected static final BiomeTemperature g = new BiomeTemperature(0.45F, 0.3F);
+ protected static final BiomeBase.BiomeTemperature h = new BiomeBase.BiomeTemperature(1.5F, 0.025F); + protected static final BiomeTemperature h = new BiomeTemperature(1.5F, 0.025F);
+ protected static final BiomeBase.BiomeTemperature i = new BiomeBase.BiomeTemperature(1.0F, 0.5F); + protected static final BiomeTemperature i = new BiomeTemperature(1.0F, 0.5F);
+ protected static final BiomeBase.BiomeTemperature j = new BiomeBase.BiomeTemperature(0.0F, 0.025F); + protected static final BiomeTemperature j = new BiomeTemperature(0.0F, 0.025F);
+ protected static final BiomeBase.BiomeTemperature k = new BiomeBase.BiomeTemperature(0.1F, 0.8F); + protected static final BiomeTemperature k = new BiomeTemperature(0.1F, 0.8F);
+ protected static final BiomeBase.BiomeTemperature l = new BiomeBase.BiomeTemperature(0.2F, 0.3F); + protected static final BiomeTemperature l = new BiomeTemperature(0.2F, 0.3F);
+ protected static final BiomeBase.BiomeTemperature m = new BiomeBase.BiomeTemperature(-0.2F, 0.1F); + protected static final BiomeTemperature m = new BiomeTemperature(-0.2F, 0.1F);
+ private static final BiomeBase[] biomes = new BiomeBase[256]; + private static final BiomeBase[] biomes = new BiomeBase[256];
+ public static final Set<BiomeBase> n = Sets.newHashSet(); + public static final Set<BiomeBase> n = Sets.newHashSet();
+ public static final Map<String, BiomeBase> o = Maps.newHashMap(); + public static final Map<String, BiomeBase> o = Maps.newHashMap();
@@ -130,20 +129,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ this.id = i; + this.id = i;
+ BiomeBase.biomes[i] = this; + BiomeBase.biomes[i] = this;
+ this.as = this.a(); + this.as = this.a();
+ this.au.add(new BiomeBase.BiomeMeta(EntitySheep.class, 12, 4, 4)); + this.au.add(new BiomeMeta(EntitySheep.class, 12, 4, 4));
+ this.au.add(new BiomeBase.BiomeMeta(EntityRabbit.class, 10, 3, 3)); + this.au.add(new BiomeMeta(EntityRabbit.class, 10, 3, 3));
+ this.au.add(new BiomeBase.BiomeMeta(EntityPig.class, 10, 4, 4)); + this.au.add(new BiomeMeta(EntityPig.class, 10, 4, 4));
+ this.au.add(new BiomeBase.BiomeMeta(EntityChicken.class, 10, 4, 4)); + this.au.add(new BiomeMeta(EntityChicken.class, 10, 4, 4));
+ this.au.add(new BiomeBase.BiomeMeta(EntityCow.class, 8, 4, 4)); + this.au.add(new BiomeMeta(EntityCow.class, 8, 4, 4));
+ this.at.add(new BiomeBase.BiomeMeta(EntitySpider.class, 100, 4, 4)); + this.at.add(new BiomeMeta(EntitySpider.class, 100, 4, 4));
+ this.at.add(new BiomeBase.BiomeMeta(EntityZombie.class, 100, 4, 4)); + this.at.add(new BiomeMeta(EntityZombie.class, 100, 4, 4));
+ this.at.add(new BiomeBase.BiomeMeta(EntitySkeleton.class, 100, 4, 4)); + this.at.add(new BiomeMeta(EntitySkeleton.class, 100, 4, 4));
+ this.at.add(new BiomeBase.BiomeMeta(EntityCreeper.class, 100, 4, 4)); + this.at.add(new BiomeMeta(EntityCreeper.class, 100, 4, 4));
+ this.at.add(new BiomeBase.BiomeMeta(EntitySlime.class, 100, 4, 4)); + this.at.add(new BiomeMeta(EntitySlime.class, 100, 4, 4));
+ this.at.add(new BiomeBase.BiomeMeta(EntityEnderman.class, 10, 1, 4)); + this.at.add(new BiomeMeta(EntityEnderman.class, 10, 1, 4));
+ this.at.add(new BiomeBase.BiomeMeta(EntityWitch.class, 5, 1, 1)); + this.at.add(new BiomeMeta(EntityWitch.class, 5, 1, 1));
+ this.av.add(new BiomeBase.BiomeMeta(EntitySquid.class, 10, 4, 4)); + this.av.add(new BiomeMeta(EntitySquid.class, 10, 4, 4));
+ this.aw.add(new BiomeBase.BiomeMeta(EntityBat.class, 10, 8, 8)); + this.aw.add(new BiomeMeta(EntityBat.class, 10, 8, 8));
+ } + }
+ +
+ protected BiomeDecorator a() { + protected BiomeDecorator a() {
@@ -160,7 +159,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ } + }
+ +
+ protected final BiomeBase a(BiomeBase.BiomeTemperature biomebase_biometemperature) { + protected final BiomeBase a(BiomeTemperature biomebase_biometemperature) {
+ this.an = biomebase_biometemperature.a; + this.an = biomebase_biometemperature.a;
+ this.ao = biomebase_biometemperature.b; + this.ao = biomebase_biometemperature.b;
+ return this; + return this;
@@ -220,7 +219,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ public List<BiomeMeta> getMobs(EnumCreatureType enumcreaturetype) { + public List<BiomeMeta> getMobs(EnumCreatureType enumcreaturetype) {
+ switch (BiomeBase.SyntheticClass_1.switchMap[enumcreaturetype.ordinal()]) { + switch (SyntheticClass_1.switchMap[enumcreaturetype.ordinal()]) {
+ case 1: + case 1:
+ return this.at; + return this.at;
+ +
@@ -356,8 +355,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return biomebase == this ? true : (biomebase == null ? false : this.l() == biomebase.l()); + return biomebase == this ? true : (biomebase == null ? false : this.l() == biomebase.l());
+ } + }
+ +
+ public BiomeBase.EnumTemperature m() { + public EnumTemperature m() {
+ return (double) this.temperature < 0.2D ? BiomeBase.EnumTemperature.COLD : ((double) this.temperature < 1.0D ? BiomeBase.EnumTemperature.MEDIUM : BiomeBase.EnumTemperature.WARM); + return (double) this.temperature < 0.2D ? EnumTemperature.COLD : ((double) this.temperature < 1.0D ? EnumTemperature.MEDIUM : EnumTemperature.WARM);
+ } + }
+ +
+ public static BiomeBase[] getBiomes() { + public static BiomeBase[] getBiomes() {
@@ -434,25 +433,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ static { + static {
+ try { + try {
+ BiomeBase.SyntheticClass_1.switchMap[EnumCreatureType.MONSTER.ordinal()] = 1; + SyntheticClass_1.switchMap[EnumCreatureType.MONSTER.ordinal()] = 1;
+ } catch (NoSuchFieldError nosuchfielderror) { + } catch (NoSuchFieldError nosuchfielderror) {
+ ; + ;
+ } + }
+ +
+ try { + try {
+ BiomeBase.SyntheticClass_1.switchMap[EnumCreatureType.CREATURE.ordinal()] = 2; + SyntheticClass_1.switchMap[EnumCreatureType.CREATURE.ordinal()] = 2;
+ } catch (NoSuchFieldError nosuchfielderror1) { + } catch (NoSuchFieldError nosuchfielderror1) {
+ ; + ;
+ } + }
+ +
+ try { + try {
+ BiomeBase.SyntheticClass_1.switchMap[EnumCreatureType.WATER_CREATURE.ordinal()] = 3; + SyntheticClass_1.switchMap[EnumCreatureType.WATER_CREATURE.ordinal()] = 3;
+ } catch (NoSuchFieldError nosuchfielderror2) { + } catch (NoSuchFieldError nosuchfielderror2) {
+ ; + ;
+ } + }
+ +
+ try { + try {
+ BiomeBase.SyntheticClass_1.switchMap[EnumCreatureType.AMBIENT.ordinal()] = 4; + SyntheticClass_1.switchMap[EnumCreatureType.AMBIENT.ordinal()] = 4;
+ } catch (NoSuchFieldError nosuchfielderror3) { + } catch (NoSuchFieldError nosuchfielderror3) {
+ ; + ;
+ } + }
@@ -488,8 +487,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ this.b = f1; + this.b = f1;
+ } + }
+ +
+ public BiomeBase.BiomeTemperature a() { + public BiomeTemperature a() {
+ return new BiomeBase.BiomeTemperature(this.a * 0.8F, this.b * 0.6F); + return new BiomeTemperature(this.a * 0.8F, this.b * 0.6F);
+ } + }
+ } + }
+ +
@@ -860,7 +859,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+package net.minecraft.server; +package net.minecraft.server;
+ +
+import com.google.common.collect.Lists; +import com.google.common.collect.Lists;
+
+import java.util.Iterator; +import java.util.Iterator;
+import java.util.List; +import java.util.List;
+import java.util.Map; +import java.util.Map;
@@ -2289,5 +2287,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+} +}
-- --
1.9.5.msysgit.1