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-5666: Customizable End City Seed

Browse source
This commit is contained in:
md_5 2020-04-10 10:51:27 +10:00
parent a03b1fdbaf
commit ae72bf43fd
26 changed files with 220 additions and 91 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 f989b35d86e25a0b4835e9be2e40b5d553645096 Mon Sep 17 00:00:00 2001
From a0e9e28e05e7442161376b2163c4059b43e3f395 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
@ -120,10 +120,10 @@ index 76aad05f..4d308c5a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9dfe70a0..3b5f9169 100644
index 79f9534d..62b90126 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1491,4 +1491,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1247,4 +1247,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param book The book to open for this player
*/
public void openBook(@NotNull ItemStack book);

6
Bukkit-Patches/0004-BungeeCord-Support.patch
View file

@ -1,14 +1,14 @@
From 9e0ea722eac16af4d7d538393c5d5d5f2937a4b1 Mon Sep 17 00:00:00 2001
From 79deb9a49fa0db5128cd269d83380a42011d6054 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3b5f9169..e24f7b6b 100644
index 62b90126..e09637f4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1495,6 +1495,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1251,6 +1251,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Spigot start
public class Spigot extends Entity.Spigot {

6
Bukkit-Patches/0007-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From f600e068f3ffd7ac81a63ce61ee972c922baa95d Mon Sep 17 00:00:00 2001
From a2a803cf3ef18e8deb1cb1ca8ae748d56d72f285 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index e24f7b6b..8985e3f0 100644
index e09637f4..a2794b79 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1505,6 +1505,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1261,6 +1261,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public InetSocketAddress getRawAddress() {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0008-Add-respawn-API.patch
View file

@ -1,14 +1,14 @@
From a9cb930f98237300af981a5c1eb76c21cc3993aa Mon Sep 17 00:00:00 2001
From be4c55cc2390b0623519852013a86cc39d607e34 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:35:58 +0200
Subject: [PATCH] Add respawn API.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8985e3f0..b31e2a57 100644
index a2794b79..b8ed0ba9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1528,6 +1528,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1284,6 +1284,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void setCollidesWithEntities(boolean collides) {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0009-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 9dc043142f3f7128fd0c10bec65eca6463102384 Mon Sep 17 00:00:00 2001
From 92564eaac4bfb4a37c48eadb5971f26892f17f8e Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:02:11 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b31e2a57..c73c152b 100644
index b8ed0ba9..3988baf8 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1535,6 +1535,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1291,6 +1291,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void respawn() {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0012-Undeprecate-Player-updateInventory-V.patch
View file

@ -1,14 +1,14 @@
From 632b85ad73b6cef7f09540b902224d52b3aa13d7 Mon Sep 17 00:00:00 2001
From 30ac2aeaee06ff94820b0bd826b001963ad9b6e4 Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Wed, 23 Jul 2014 15:50:36 -0400
Subject: [PATCH] Undeprecate Player#updateInventory()V
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index e3a54069..bae415e0 100644
index 3988baf8..e2a38451 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -445,10 +445,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -444,10 +444,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Forces an update of the player's entire inventory.
*

6
Bukkit-Patches/0013-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From a97ea43d5a5f5a2f5c7faf0d5a80acfbd5719bf7 Mon Sep 17 00:00:00 2001
From b11df4e72cf1a266aac98561ac23382ec8620034 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 02:59:14 +0100
Subject: [PATCH] BungeeCord Chat API
@ -342,10 +342,10 @@ index 8e42cb9d..a9020ecc 100644
@NotNull
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index efaff909..9b0153f7 100644
index e2a38451..92bafd63 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1543,6 +1543,36 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1299,6 +1299,36 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public java.util.Set<Player> getHiddenPlayers() {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,4 +1,4 @@
From 6878019f03ffa6a75c7dcb6d4f4fe43b1f83ea5d Mon Sep 17 00:00:00 2001
From 1de397eaf8d2c42e54e8df8d71d1fa6ca1951929 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
@ -122,10 +122,10 @@ index cb1efe969..1d4ba473a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4109e6b0b..5c60a52e0 100644
index 405c8ba10..97a25ec41 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1669,4 +1669,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1634,4 +1634,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().openBook(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(book), net.minecraft.server.EnumHand.MAIN_HAND);
getInventory().setItemInMainHand(hand);
}

116
CraftBukkit-Patches/0003-mc-dev-imports.patch
View file

@ -1,4 +1,4 @@
From 21aff422a85db7c39fe4c0f6ff53a6f0f240d811 Mon Sep 17 00:00:00 2001
From 450f51780c2c0f83358a63580061082067a2cdb5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 15:10:48 +1100
Subject: [PATCH] mc-dev imports
@ -3196,6 +3196,120 @@ index 000000000..895a8dfb8
+ }
+ }
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenEndCity.java b/src/main/java/net/minecraft/server/WorldGenEndCity.java
new file mode 100644
index 000000000..99ae7ea9f
--- /dev/null
+++ b/src/main/java/net/minecraft/server/WorldGenEndCity.java
@@ -0,0 +1,108 @@
+package net.minecraft.server;
+
+import com.mojang.datafixers.Dynamic;
+import java.util.Random;
+import java.util.function.Function;
+
+public class WorldGenEndCity extends StructureGenerator<WorldGenFeatureEmptyConfiguration> {
+
+ public WorldGenEndCity(Function<Dynamic<?>, ? extends WorldGenFeatureEmptyConfiguration> function) {
+ super(function);
+ }
+
+ @Override
+ protected ChunkCoordIntPair a(ChunkGenerator<?> chunkgenerator, Random random, int i, int j, int k, int l) {
+ int i1 = chunkgenerator.getSettings().n();
+ int j1 = chunkgenerator.getSettings().o();
+ int k1 = i + i1 * k;
+ int l1 = j + i1 * l;
+ int i2 = k1 < 0 ? k1 - i1 + 1 : k1;
+ int j2 = l1 < 0 ? l1 - i1 + 1 : l1;
+ int k2 = i2 / i1;
+ int l2 = j2 / i1;
+
+ ((SeededRandom) random).a(chunkgenerator.getSeed(), k2, l2, 10387313);
+ k2 *= i1;
+ l2 *= i1;
+ k2 += (random.nextInt(i1 - j1) + random.nextInt(i1 - j1)) / 2;
+ l2 += (random.nextInt(i1 - j1) + random.nextInt(i1 - j1)) / 2;
+ return new ChunkCoordIntPair(k2, l2);
+ }
+
+ @Override
+ public boolean a(BiomeManager biomemanager, ChunkGenerator<?> chunkgenerator, Random random, int i, int j, BiomeBase biomebase) {
+ ChunkCoordIntPair chunkcoordintpair = this.a(chunkgenerator, random, i, j, 0, 0);
+
+ if (i == chunkcoordintpair.x && j == chunkcoordintpair.z) {
+ if (!chunkgenerator.canSpawnStructure(biomebase, this)) {
+ return false;
+ } else {
+ int k = b(i, j, chunkgenerator);
+
+ return k >= 60;
+ }
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public StructureGenerator.a a() {
+ return WorldGenEndCity.a::new;
+ }
+
+ @Override
+ public String b() {
+ return "EndCity";
+ }
+
+ @Override
+ public int c() {
+ return 8;
+ }
+
+ private static int b(int i, int j, ChunkGenerator<?> chunkgenerator) {
+ Random random = new Random((long) (i + j * 10387313));
+ EnumBlockRotation enumblockrotation = EnumBlockRotation.values()[random.nextInt(EnumBlockRotation.values().length)];
+ byte b0 = 5;
+ byte b1 = 5;
+
+ if (enumblockrotation == EnumBlockRotation.CLOCKWISE_90) {
+ b0 = -5;
+ } else if (enumblockrotation == EnumBlockRotation.CLOCKWISE_180) {
+ b0 = -5;
+ b1 = -5;
+ } else if (enumblockrotation == EnumBlockRotation.COUNTERCLOCKWISE_90) {
+ b1 = -5;
+ }
+
+ int k = (i << 4) + 7;
+ int l = (j << 4) + 7;
+ int i1 = chunkgenerator.c(k, l, HeightMap.Type.WORLD_SURFACE_WG);
+ int j1 = chunkgenerator.c(k, l + b1, HeightMap.Type.WORLD_SURFACE_WG);
+ int k1 = chunkgenerator.c(k + b0, l, HeightMap.Type.WORLD_SURFACE_WG);
+ int l1 = chunkgenerator.c(k + b0, l + b1, HeightMap.Type.WORLD_SURFACE_WG);
+
+ return Math.min(Math.min(i1, j1), Math.min(k1, l1));
+ }
+
+ public static class a extends StructureStart {
+
+ public a(StructureGenerator<?> structuregenerator, int i, int j, StructureBoundingBox structureboundingbox, int k, long l) {
+ super(structuregenerator, i, j, structureboundingbox, k, l);
+ }
+
+ @Override
+ public void a(ChunkGenerator<?> chunkgenerator, DefinedStructureManager definedstructuremanager, int i, int j, BiomeBase biomebase) {
+ EnumBlockRotation enumblockrotation = EnumBlockRotation.values()[this.d.nextInt(EnumBlockRotation.values().length)];
+ int k = WorldGenEndCity.b(i, j, chunkgenerator);
+
+ if (k >= 60) {
+ BlockPosition blockposition = new BlockPosition(i * 16 + 8, k, j * 16 + 8);
+
+ WorldGenEndCityPieces.a(definedstructuremanager, blockposition, enumblockrotation, this.b, this.d);
+ this.b();
+ }
+ }
+ }
+}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
new file mode 100644
index 000000000..3a51d5cc4

6
CraftBukkit-Patches/0007-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 0987ad8c530e3d210bcd40e5df6f838aeef9c6cc Mon Sep 17 00:00:00 2001
From e26fb1335110678f5694eb654ea38c1cb24fd5b8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -189,10 +189,10 @@ index 57850343e..b48d81e51 100644
List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5c60a52e0..d3123345d 100644
index 97a25ec41..f4420e5e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -300,6 +300,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -299,6 +299,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {

14
CraftBukkit-Patches/0009-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 11e1a4936401bf6fe09f92aaec70ee43283881b8 Mon Sep 17 00:00:00 2001
From deb24cd352468dfe6bc7d2273eca7390d13328ee Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -409,7 +409,7 @@ index 68e220bef..b7175ee6a 100644
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6f05e3a3b..71bf7a0cc 100644
index 74f6b92ef..3717444bc 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,6 +18,7 @@ import org.apache.logging.log4j.util.Supplier;
@ -437,7 +437,7 @@ index 6f05e3a3b..71bf7a0cc 100644
}
@Override
@@ -559,6 +563,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -561,6 +565,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
GameProfilerFiller gameprofilerfiller = this.getMethodProfiler();
gameprofilerfiller.enter("blockEntities");
@ -445,7 +445,7 @@ index 6f05e3a3b..71bf7a0cc 100644
if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
this.tileEntityList.removeAll(this.tileEntityListUnload);
@@ -579,6 +584,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -581,6 +586,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
gameprofilerfiller.a(() -> {
return String.valueOf(TileEntityTypes.a(tileentity.getTileType()));
});
@ -453,7 +453,7 @@ index 6f05e3a3b..71bf7a0cc 100644
if (tileentity.getTileType().isValidBlock(this.getType(blockposition).getBlock())) {
((ITickable) tileentity).tick();
} else {
@@ -593,6 +599,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -595,6 +601,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
tileentity.a(crashreportsystemdetails);
throw new ReportedException(crashreport);
}
@ -465,7 +465,7 @@ index 6f05e3a3b..71bf7a0cc 100644
}
}
@@ -605,6 +616,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -607,6 +618,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
}
@ -474,7 +474,7 @@ index 6f05e3a3b..71bf7a0cc 100644
this.tickingTileEntities = false;
gameprofilerfiller.exitEnter("pendingBlockEntities");
if (!this.tileEntityListPending.isEmpty()) {
@@ -637,12 +650,15 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -639,12 +652,15 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
this.tileEntityListPending.clear();
}

6
CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch
View file

@ -1,14 +1,14 @@
From 0736df2b262be27353d5a398ad9f6165222bf574 Mon Sep 17 00:00:00 2001
From 4f5acd6ae00e289c51f94cd55c0cf0061184c073 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 71bf7a0cc..60638b768 100644
index 3717444bc..e48cb6991 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -575,6 +575,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -577,6 +577,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();

6
CraftBukkit-Patches/0025-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From 0e9af376c88f55086b516513ab787f91d589e4fd Mon Sep 17 00:00:00 2001
From 40e61636db77ceede3464dade8e9c629a58a45f0 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Mar 2016 20:35:09 +1100
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d3123345d..b4e5d7075 100644
index f4420e5e9..85b325fde 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1674,6 +1674,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1639,6 +1639,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0028-Implement-respawn-API.patch
View file

@ -1,14 +1,14 @@
From 169b584ce904a3a6a894f461ffcc44504024c639 Mon Sep 17 00:00:00 2001
From 3e58b5989058fd3fccffd0dc597000a9a5c700e5 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b4e5d7075..701ee301b 100644
index 85b325fde..265680f47 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1684,6 +1684,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1649,6 +1649,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
}

10
CraftBukkit-Patches/0033-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 7d336b9bfbe4f036ed35fe1ec6bb5ed4109cfcf4 Mon Sep 17 00:00:00 2001
From 04e8f614145d23e94b5eae728f534416719bb39d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -115,7 +115,7 @@ index 6aeea22ae..4f008e472 100644
this.d = EnumProtocol.a(packetdataserializer.i());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 688a680eb..3f1c7b24e 100644
index 18f0e0767..19af53bbf 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -461,7 +461,7 @@ public abstract class PlayerList {
@ -128,7 +128,7 @@ index 688a680eb..3f1c7b24e 100644
if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1c6f79389..16efb9af8 100644
index 7ed9e9579..f1f9254fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -626,7 +626,13 @@ public final class CraftServer implements Server {
@ -147,10 +147,10 @@ index 1c6f79389..16efb9af8 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 701ee301b..f87d992cc 100644
index 265680f47..ddeefa4ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1675,6 +1675,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1640,6 +1640,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0039-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,14 +1,14 @@
From 68825611709f0ebde66d491f7d528b883ef88645 Mon Sep 17 00:00:00 2001
From 7f73d3b26011ff045d695ae0270094b393ac5093 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f87d992cc..2bd88cc77 100644
index ddeefa4ff..5a89ed1a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1445,7 +1445,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1410,7 +1410,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

6
CraftBukkit-Patches/0049-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From d86a4e60380caa1092fbd203ca67cd7a70dfdce7 Mon Sep 17 00:00:00 2001
From 71f6ac668e838597360c423239e2b005eb6a0397 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2bd88cc77..2bc30ec5d 100644
index 5a89ed1a9..1514a4970 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1699,6 +1699,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1664,6 +1664,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), net.minecraft.server.DimensionManager.OVERWORLD, false );
}
}

8
CraftBukkit-Patches/0065-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
View file

@ -1,11 +1,11 @@
From 2abffa7f63133c2a74d8c7f7c53bbd0a8431f98f Mon Sep 17 00:00:00 2001
From e7f19d886573cc1b9e8cf3c57b6fe7d520d85661 Mon Sep 17 00:00:00 2001
From: David <dmck2b@gmail.com>
Date: Mon, 21 Apr 2014 12:43:08 +0100
Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 60638b768..e1ee98c2d 100644
index e48cb6991..de61c62be 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -71,6 +71,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -16,7 +16,7 @@ index 60638b768..e1ee98c2d 100644
public CraftWorld getWorld() {
return this.world;
@@ -263,7 +264,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -265,7 +266,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
// CraftBukkit start
if (!this.captureBlockStates) { // Don't notify clients or update physics while capturing blockstates
// Modularize client and physic updates
@ -31,7 +31,7 @@ index 60638b768..e1ee98c2d 100644
}
// CraftBukkit end
@@ -420,6 +427,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -422,6 +429,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
// CraftBukkit end
iblockdata.doPhysics(this, blockposition, block, blockposition1, false);

23
CraftBukkit-Patches/0072-Further-Seed-Customisation.patch
View file

@ -1,4 +1,4 @@
From 587d5d0711bc0933bedde0d882c6dc44f2e3cb4b Mon Sep 17 00:00:00 2001
From 0ac73134c88db8cce0bcfde0062dab5d48727a33 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
@ -33,6 +33,19 @@ index 5c96f83e9..8e8526f37 100644
if (random.nextInt(10) == 0 && flag && blockposition.getY() < 40) {
return a(entitytypes, generatoraccess, enummobspawn, blockposition, random);
diff --git a/src/main/java/net/minecraft/server/WorldGenEndCity.java b/src/main/java/net/minecraft/server/WorldGenEndCity.java
index 99ae7ea9f..ead7167d1 100644
--- a/src/main/java/net/minecraft/server/WorldGenEndCity.java
+++ b/src/main/java/net/minecraft/server/WorldGenEndCity.java
@@ -21,7 +21,7 @@ public class WorldGenEndCity extends StructureGenerator<WorldGenFeatureEmptyConf
int k2 = i2 / i1;
int l2 = j2 / i1;
- ((SeededRandom) random).a(chunkgenerator.getSeed(), k2, l2, 10387313);
+ ((SeededRandom) random).a(chunkgenerator.getSeed(), k2, l2, chunkgenerator.getWorld().spigotConfig.endCitySeed); // Spigot
k2 *= i1;
l2 *= i1;
k2 += (random.nextInt(i1 - j1) + random.nextInt(i1 - j1)) / 2;
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
index 3a51d5cc4..c71b59a10 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
@ -227,10 +240,10 @@ index 79a0513ac..8feacd61e 100644
+ // Spigot end
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 0f9d5cb4f..512618cc6 100644
index 0f9d5cb4f..ed560ae77 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -263,4 +263,29 @@ public class SpigotWorldConfig
@@ -263,4 +263,31 @@ public class SpigotWorldConfig
{
witherSpawnSoundRadius = getInt( "wither-spawn-sound-radius", 0 );
}
@ -245,6 +258,7 @@ index 0f9d5cb4f..512618cc6 100644
+ public int outpostSeed;
+ public int shipwreckSeed;
+ public int slimeSeed;
+ public int endCitySeed;
+ private void initWorldGenSeeds()
+ {
+ villageSeed = getInt( "seed-village", 10387312 );
@ -256,8 +270,9 @@ index 0f9d5cb4f..512618cc6 100644
+ shipwreckSeed = getInt( "seed-shipwreck", 165745295 );
+ oceanSeed = getInt( "seed-ocean", 14357621 );
+ outpostSeed = getInt( "seed-outpost", 165745296 );
+ endCitySeed = getInt( "seed-endcity", 10387313 );
+ slimeSeed = getInt( "seed-slime", 987234911 );
+ log( "Custom Map Seeds: Village: " + villageSeed + " Desert: " + desertSeed + " Igloo: " + iglooSeed + " Jungle: " + jungleSeed + " Swamp: " + swampSeed + " Monument: " + monumentSeed + " Ocean: " + oceanSeed + " Shipwreck: " + shipwreckSeed + " Slime: " + slimeSeed );
+ log( "Custom Map Seeds: Village: " + villageSeed + " Desert: " + desertSeed + " Igloo: " + iglooSeed + " Jungle: " + jungleSeed + " Swamp: " + swampSeed + " Monument: " + monumentSeed + " Ocean: " + oceanSeed + " Shipwreck: " + shipwreckSeed + " End City: " + endCitySeed + " Slime: " + slimeSeed );
+ }
}
--

6
CraftBukkit-Patches/0077-Prevent-a-crash-involving-attributes.patch
View file

@ -1,14 +1,14 @@
From 074fe7d8a8a62dc44f91e03997caeb732b909151 Mon Sep 17 00:00:00 2001
From 146db695192385d942d01986c9a08c15dda11313 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 19:54:41 +0100
Subject: [PATCH] Prevent a crash involving attributes
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2bc30ec5d..6471a161b 100644
index 1514a4970..b3f837599 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1525,7 +1525,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1490,7 +1490,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
break;
}
}

8
CraftBukkit-Patches/0085-Add-Hunger-Config-Values.patch
View file

@ -1,4 +1,4 @@
From fcbebaf939e9a5eb38a29e84bf908cf226848a8d Mon Sep 17 00:00:00 2001
From da7ed628746cc950c6789c7b4e58a3b568444365 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,12 +76,12 @@ index 4fec836e0..01d702d5c 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 512618cc6..03203f220 100644
index ed560ae77..defdcae52 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -288,4 +288,30 @@ public class SpigotWorldConfig
@@ -290,4 +290,30 @@ public class SpigotWorldConfig
slimeSeed = getInt( "seed-slime", 987234911 );
log( "Custom Map Seeds: Village: " + villageSeed + " Desert: " + desertSeed + " Igloo: " + iglooSeed + " Jungle: " + jungleSeed + " Swamp: " + swampSeed + " Monument: " + monumentSeed + " Ocean: " + oceanSeed + " Shipwreck: " + shipwreckSeed + " Slime: " + slimeSeed );
log( "Custom Map Seeds: Village: " + villageSeed + " Desert: " + desertSeed + " Igloo: " + iglooSeed + " Jungle: " + jungleSeed + " Swamp: " + swampSeed + " Monument: " + monumentSeed + " Ocean: " + oceanSeed + " Shipwreck: " + shipwreckSeed + " End City: " + endCitySeed + " Slime: " + slimeSeed );
}
+
+ public float jumpWalkExhaustion;

10
CraftBukkit-Patches/0087-Limit-TNT-Detonations-per-tick.patch
View file

@ -1,4 +1,4 @@
From 715ac644b3c1929647b6b19c95f47be048b36056 Mon Sep 17 00:00:00 2001
From 75659b90b9de14264c397c36e5fcb24b9ab62c5b 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
@ -19,10 +19,10 @@ index ec238b051..d04212436 100644
this.setMot(this.getMot().add(0.0D, -0.04D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e1ee98c2d..fc7ee00f4 100644
index de61c62be..bb7514190 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -670,6 +670,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -672,6 +672,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
timings.tileEntityPending.stopTiming(); // Spigot
gameprofilerfiller.exit();
@ -31,10 +31,10 @@ index e1ee98c2d..fc7ee00f4 100644
public void a(Consumer<Entity> consumer, Entity entity) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 03203f220..df26a350e 100644
index defdcae52..2ee1cffb6 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -314,4 +314,15 @@ public class SpigotWorldConfig
@@ -316,4 +316,15 @@ public class SpigotWorldConfig
sprintMultiplier = (float) getDouble( "hunger.sprint-multiplier", 0.1 );
otherMultiplier = (float) getDouble( "hunger.other-multiplier", 0.0 );
}

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

@ -1,4 +1,4 @@
From 5945bbdd8eadeeaad4a4242bb6cb77cdf78ac197 Mon Sep 17 00:00:00 2001
From 5c6454d632c571a3e919bfa6f17e3cb10bb95b0a 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 83af1b422..21dbc9b2a 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 291f0cfec..aa6c7124c 100644
index 2ee1cffb6..9e1d82568 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -325,4 +325,10 @@ public class SpigotWorldConfig
@@ -327,4 +327,10 @@ public class SpigotWorldConfig
maxTntTicksPerTick = getInt( "max-tnt-per-tick", 100 );
log( "Max TNT Explosions: " + maxTntTicksPerTick );
}

8
CraftBukkit-Patches/0089-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From 5695bed76c70e2ce3979323d27954c0dd48a2ab7 Mon Sep 17 00:00:00 2001
From 883d5e46f78261dc403c4f2033699f5435e063b7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -109,10 +109,10 @@ index c781f548b..63ecbcd47 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6471a161b..9eba8449e 100644
index b3f837599..4fed5dc92 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -118,6 +118,8 @@ import org.bukkit.plugin.Plugin;
@@ -117,6 +117,8 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.scoreboard.Scoreboard;
@ -121,7 +121,7 @@ index 6471a161b..9eba8449e 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -1719,6 +1721,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1684,6 +1686,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}

12
CraftBukkit-Patches/0090-Allow-Capping-Tile-Entity-Tick-Time.patch
View file

@ -1,4 +1,4 @@
From 818871cfacd1fbaa36c7926b24b7fc6b6ae9cf28 Mon Sep 17 00:00:00 2001
From c7257447cbc62c435f6713f6a350a85cae3d7911 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.
@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based
This feature was commisioned by Chunkr.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index fc7ee00f4..487346ce8 100644
index bb7514190..ad43b4807 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -72,6 +72,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -32,7 +32,7 @@ index fc7ee00f4..487346ce8 100644
}
@Override
@@ -582,14 +587,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -584,14 +589,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
this.tickingTileEntities = true;
@ -57,7 +57,7 @@ index fc7ee00f4..487346ce8 100644
continue;
}
// Spigot end
@@ -626,7 +636,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -628,7 +638,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
if (tileentity.isRemoved()) {
@ -70,10 +70,10 @@ index fc7ee00f4..487346ce8 100644
if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).removeTileEntity(tileentity.getPosition());
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 3b0e86096..9cad3c261 100644
index 9e1d82568..d41ae7180 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -331,4 +331,13 @@ public class SpigotWorldConfig
@@ -333,4 +333,13 @@ public class SpigotWorldConfig
{
hangingTickFrequency = getInt( "hanging-tick-frequency", 100 );
}

6
CraftBukkit-Patches/0098-Allow-changing-minimum-squid-spawn-range.patch
View file

@ -1,4 +1,4 @@
From 75a8583d3a9c69c55d18841d78cc562af7e897b3 Mon Sep 17 00:00:00 2001
From b7e8d1afa5ea0280d1af671bee5acf52c548fb6d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 11 Jan 2018 08:23:43 +1100
Subject: [PATCH] Allow changing minimum squid spawn range
@ -18,10 +18,10 @@ index 6bcea493b..8c4f3b2c2 100644
public void a(float f, float f1, float f2) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 3e96bd11c..34964d285 100644
index d41ae7180..5fdc9bc71 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -340,4 +340,10 @@ public class SpigotWorldConfig
@@ -342,4 +342,10 @@ public class SpigotWorldConfig
entityMaxTickTime = getInt("max-tick-time.entity", 50);
log("Tile Max Tick Time: " + tileMaxTickTime + "ms Entity max Tick Time: " + entityMaxTickTime + "ms");
}