Update mc-dev etc.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-01 15:13:58 +11:00
parent ff79e2c7df
commit 9746fe7a1e
10 changed files with 95 additions and 553 deletions

View File

@@ -1,30 +1,29 @@
From b8c36f916c18da6c3446eb6298bfa9cdc15e8b4d Mon Sep 17 00:00:00 2001
From 35c24fa363d24102afd5b9ebb087ebba6e1e845a 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
diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
index ab4dc19..cb8ff49 100644
index 1eb87ae..b3c8101 100644
--- a/src/main/java/net/minecraft/server/StructureGenerator.java
+++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -178,7 +178,15 @@ public abstract class StructureGenerator extends WorldGenBase {
private void a(World world) {
if (this.e == null) {
- this.e = (WorldGenFeature) world.a(WorldGenFeature.class, this.a());
+ // Spigot Start
+ if ( world.spigotConfig.saveStructureInfo )
+ {
+ this.e = (WorldGenFeature) world.a( WorldGenFeature.class, this.a() );
this.e = (PersistentStructure) world.a(PersistentStructure.class, this.a());
+ } else
+ {
+ this.e = new WorldGenFeature( this.a() );
+ this.e = new PersistentStructure( this.a() );
+ }
+ // Spigot End
if (this.e == null) {
this.e = new WorldGenFeature(this.a());
world.a(this.a(), (WorldMapBase) this.e);
this.e = new PersistentStructure(this.a());
world.a(this.a(), (PersistentBase) this.e);
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 2caafa2..a34670e 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java