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-3315: Add option to disable advancement saving

Browse source
This commit is contained in:
md_5 2017-06-10 16:08:32 +10:00
parent d5dfb24fe8
commit 87496dfb1d
5 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 27d98511379b3d0ed08579df105305359579d942 Mon Sep 17 00:00:00 2001
From 543d55a7ec8bd7c1acde64f7dc5b0cbd4c2e2697 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
@ -25,10 +25,10 @@ index fc92b912f..f392f3c8f 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 2574bee48..44354f989 100644
index b32766959..c113bc62d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1554,4 +1554,14 @@ public class CraftWorld implements World {
@@ -1556,4 +1556,14 @@ public class CraftWorld implements World {
cps.unload(chunk);
}
}

8
CraftBukkit-Patches/0050-Particle-API.patch
View file

@ -1,4 +1,4 @@
From d399742957f13fa97ab3d0830872dd2eda15a098 Mon Sep 17 00:00:00 2001
From 9964b72bc53aff47e0545d5a1f0ab4b02239edb4 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -19,10 +19,10 @@ index 16721835a..352ff3af9 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ebe540cf8..c95b979e3 100644
index ae00cacc4..4bb5bcfee 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -831,28 +831,18 @@ public class CraftWorld implements World {
@@ -833,28 +833,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@ -60,7 +60,7 @@ index ebe540cf8..c95b979e3 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1560,6 +1550,70 @@ public class CraftWorld implements World {
@@ -1562,6 +1552,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0072-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From d90064e7d3a872c204531bd3fc159651b57e0645 Mon Sep 17 00:00:00 2001
From 2c77f4162d5e673fe171909616c7a95fe96ed7e0 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -40,10 +40,10 @@ index a61531ad2..acb3408d5 100644
// this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dG, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index dd2fbd365..a07dbd7db 100644
index fc3c7b35b..3550712cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1619,6 +1619,22 @@ public class CraftWorld implements World {
@@ -1621,6 +1621,22 @@ public class CraftWorld implements World {
{
CraftWorld.this.playEffect( location, effect, 0 );
}

6
CraftBukkit-Patches/0112-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View file

@ -1,4 +1,4 @@
From ebb8e149a42a66507fb9a19411f262e6b412021d Mon Sep 17 00:00:00 2001
From d47bb6d226021afbde5f7233d9f3e53346170827 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
@ -26,10 +26,10 @@ index f270960c3..a42d3c3b2 100644
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a07dbd7db..0a2d6f3ef 100644
index 3550712cc..44a3dc9f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1179,6 +1179,12 @@ public class CraftWorld implements World {
@@ -1181,6 +1181,12 @@ public class CraftWorld implements World {
}
if (entity != null) {

22
CraftBukkit-Patches/0142-Configurable-Advancement-Disabling.patch
View file

@ -1,10 +1,22 @@
From 5d73659ba796635445459e7bb21b11a46fad1368 Mon Sep 17 00:00:00 2001
From fc9028c11321d4e6c834c5e57e4924617f9734c6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 9 Jun 2017 16:29:31 +1000
Subject: [PATCH] Configurable Advancement Disabling
Allow disabling any (or all) inbuilt advancements with a configuration option.
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index 9137685f1..ada6b5d8f 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -166,6 +166,7 @@ public class AdvancementDataPlayer {
}
public void c() {
+ if (org.spigotmc.SpigotConfig.disableAdvancementSaving) return;
HashMap hashmap = Maps.newHashMap();
Iterator iterator = this.data.entrySet().iterator();
diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
index 5ae0609d8..39a603326 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataWorld.java
@ -22,17 +34,19 @@ index 5ae0609d8..39a603326 100644
if (!map.containsKey(minecraftkey)) {
BufferedReader bufferedreader = null;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 4b21fa599..80068e285 100644
index 4b21fa599..1b5158c0d 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -392,4 +392,9 @@ public class SpigotConfig
@@ -392,4 +392,11 @@ public class SpigotConfig
private static void itemDirtyTicks() {
itemDirtyTicks = getInt("settings.item-dirty-ticks", 20);
}
+
+ public static boolean disableAdvancementSaving;
+ public static List<String> disabledAdvancements;
+ private static void disabledAdvancements() {
+ disabledAdvancements = getList("disabled-advancements", Arrays.asList(new String[]{"minecraft:story/disabled"}));
+ disableAdvancementSaving = getBoolean("advancements.disable-saving", false);
+ disabledAdvancements = getList("advancements.disabled", Arrays.asList(new String[]{"minecraft:story/disabled"}));
+ }
}
--