mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
@@ -73,7 +73,7 @@ index 935b22199ebdf84db591f8442e0506d8fcc92e02..4ed4ca8e623784f12e2c7850e1c055f3
|
||||
+
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 0c295854f31422cf3ad699d229805c5881a65eed..359f8a37e625af463f898f72b8c30ff41f84c672 100644
|
||||
index 8708eb173fbb17cf84a0c6d9a42623750472f650..cd571bf9cce0a1636142b0a8afa59afac4a40d5c 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2349,6 +2349,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
@@ -1218,7 +1218,7 @@ index d9fb3df35de94ae5abbb86ace0328bbe6f5403b3..0e066782ee09bb5626715bcc500bc04f
|
||||
|
||||
Pair<MobEffect, Integer> pair = (Pair) optional.get();
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
index 8104ac0f77e8e94f294b82f7badefccd72419223..db17b971bb2da8ae375347040029e17b1a6165f5 100644
|
||||
index 06bf44ceb6f959a99f268fe1e1dca494985fbf4e..2a8f6d920370b4087895e9f0098a0f41d9b1e152 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -68,6 +68,18 @@ public class Ocelot extends Animal {
|
||||
@@ -1237,7 +1237,7 @@ index 8104ac0f77e8e94f294b82f7badefccd72419223..db17b971bb2da8ae375347040029e17b
|
||||
+ }
|
||||
+ // Purpur end
|
||||
+
|
||||
boolean isTrusting() {
|
||||
public boolean isTrusting() {
|
||||
return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
|
||||
}
|
||||
@@ -99,12 +111,14 @@ public class Ocelot extends Animal {
|
||||
|
||||
@@ -161,7 +161,7 @@ index 2300abc4e80449e6b92992f6fb8cfe8e99dea351..c372d47a929e06c8cfb0df86cf4e9bfe
|
||||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
index 6cc8f6ef75e4b8b4282e4f664a83ce6491042df1..9ce846d057a08b6a2b6576255bc55293707e3d24 100644
|
||||
index ee9dfc609cc9e4a94dca7803e51bb456c1e63389..80749df5d00df415a1b9e7c0e8586625b6453ffb 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -169,6 +169,11 @@ public class Fox extends Animal {
|
||||
@@ -209,7 +209,7 @@ index 0e066782ee09bb5626715bcc500bc04f2252bc2e..e08618d418f44789441177e6ac5877e5
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
index db17b971bb2da8ae375347040029e17b1a6165f5..4e979a8012b8b001c6a35c477c01d7da67583220 100644
|
||||
index 2a8f6d920370b4087895e9f0098a0f41d9b1e152..de0247899f0bf785a94e39e170c8e2fc8a58b590 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -78,6 +78,11 @@ public class Ocelot extends Animal {
|
||||
@@ -223,7 +223,7 @@ index db17b971bb2da8ae375347040029e17b1a6165f5..4e979a8012b8b001c6a35c477c01d7da
|
||||
+ }
|
||||
// Purpur end
|
||||
|
||||
boolean isTrusting() {
|
||||
public boolean isTrusting() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
index 4591b67537aa95ce0a7e6ad838b7db9da80346cc..13ef0071b98ad2b7654914b62711a661f14b2c42 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Wed, 15 Jul 2020 11:49:36 -0500
|
||||
Subject: [PATCH] Configurable end spike seed
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
|
||||
index c03bf5bdb67b00c75f9fcfead882c4d944282244..59f7ec9b307a99c5fe2def995523a5f659736451 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
|
||||
@@ -36,7 +36,8 @@ public class SpikeFeature extends Feature<SpikeConfiguration> {
|
||||
}
|
||||
|
||||
public static List<SpikeFeature.EndSpike> getSpikesForLevel(WorldGenLevel world) {
|
||||
- Random random = new Random(world.getSeed());
|
||||
+ int seed = net.pl3x.purpur.PurpurConfig.endSpikeSeed; // Purpur
|
||||
+ Random random = new Random(seed == -1 ? world.getSeed() : seed); // Purpur
|
||||
long l = random.nextLong() & 65535L;
|
||||
return SPIKE_CACHE.getUnchecked(l);
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index fa1af3c9da4fee4c529113b30f652c3243e73635..d6f5b2d0ae5f75e07a3879741ed0bae9def1eb3a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -1,5 +1,6 @@
|
||||
package net.pl3x.purpur;
|
||||
|
||||
+import co.aikar.timings.TimingsManager;
|
||||
import com.google.common.base.Throwables;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.pl3x.purpur.command.PurpurCommand;
|
||||
@@ -147,6 +148,13 @@ public class PurpurConfig {
|
||||
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
|
||||
}
|
||||
|
||||
+ public static int endSpikeSeed = -1;
|
||||
+ private static void seedSettings() {
|
||||
+ endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed);
|
||||
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
|
||||
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed.end-spike")) TimingsManager.hiddenConfigs.add("settings.seed.end-spike");
|
||||
+ }
|
||||
+
|
||||
public static String serverModName = "Purpur";
|
||||
private static void serverModName() {
|
||||
serverModName = getString("settings.server-mod-name", serverModName);
|
||||
131
patches/server/0085-Configurable-feature-seed-settings.patch
Normal file
131
patches/server/0085-Configurable-feature-seed-settings.patch
Normal file
@@ -0,0 +1,131 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Wed, 15 Jul 2020 11:49:36 -0500
|
||||
Subject: [PATCH] Configurable feature seed settings
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
|
||||
index 74a0adf4adf2b701126724e08bb72fa4e8e8560a..464a416069a87c390df3a0842fb34bc1049e9c6f 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
|
||||
@@ -26,6 +26,7 @@ import net.minecraft.world.level.material.FluidState;
|
||||
|
||||
public class GeodeFeature extends Feature<GeodeConfiguration> {
|
||||
private static final Direction[] DIRECTIONS = Direction.values();
|
||||
+ private Random rnd; // Purpur
|
||||
|
||||
public GeodeFeature(Codec<GeodeConfiguration> configCodec) {
|
||||
super(configCodec);
|
||||
@@ -33,8 +34,14 @@ public class GeodeFeature extends Feature<GeodeConfiguration> {
|
||||
|
||||
@Override
|
||||
public boolean place(FeaturePlaceContext<GeodeConfiguration> context) {
|
||||
+ // Purpur start
|
||||
+ if (this.rnd == null) {
|
||||
+ int seed = net.pl3x.purpur.PurpurConfig.geodeSeed;
|
||||
+ this.rnd = seed == -1 ? context.random() : new Random(seed);
|
||||
+ }
|
||||
+ // Purpur end
|
||||
GeodeConfiguration geodeConfiguration = context.config();
|
||||
- Random random = context.random();
|
||||
+ Random random = this.rnd; // Purpur
|
||||
BlockPos blockPos = context.origin();
|
||||
WorldGenLevel worldGenLevel = context.level();
|
||||
int i = geodeConfiguration.minGenOffset;
|
||||
diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
|
||||
index d36b6208077254af5f0ebed8e8ce20fd45cbb79d..612bc6e4a759df96bade4c322aad0b3e8753e0ee 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
|
||||
@@ -25,6 +25,7 @@ public class MonsterRoomFeature extends Feature<NoneFeatureConfiguration> {
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
private static final EntityType<?>[] MOBS = new EntityType[]{EntityType.SKELETON, EntityType.ZOMBIE, EntityType.ZOMBIE, EntityType.SPIDER};
|
||||
private static final BlockState AIR = Blocks.CAVE_AIR.defaultBlockState();
|
||||
+ private Random rnd; // Purpur
|
||||
|
||||
public MonsterRoomFeature(Codec<NoneFeatureConfiguration> configCodec) {
|
||||
super(configCodec);
|
||||
@@ -32,9 +33,15 @@ public class MonsterRoomFeature extends Feature<NoneFeatureConfiguration> {
|
||||
|
||||
@Override
|
||||
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> context) {
|
||||
+ // Purpur start
|
||||
+ if (this.rnd == null) {
|
||||
+ int seed = net.pl3x.purpur.PurpurConfig.dungeonSeed;
|
||||
+ this.rnd = seed == -1 ? context.random() : new Random(seed);
|
||||
+ }
|
||||
+ // Purpur end
|
||||
Predicate<BlockState> predicate = Feature.isReplaceable(BlockTags.FEATURES_CANNOT_REPLACE.getName());
|
||||
BlockPos blockPos = context.origin();
|
||||
- Random random = context.random();
|
||||
+ Random random = this.rnd; // Purpur
|
||||
WorldGenLevel worldGenLevel = context.level();
|
||||
int i = 3;
|
||||
int j = random.nextInt(2) + 2;
|
||||
diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
|
||||
index c03bf5bdb67b00c75f9fcfead882c4d944282244..1f71cd40b9fe5aeb118b698c9932c8a43d5ca4a5 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
|
||||
@@ -30,22 +30,30 @@ public class SpikeFeature extends Feature<SpikeConfiguration> {
|
||||
public static final int NUMBER_OF_SPIKES = 10;
|
||||
private static final int SPIKE_DISTANCE = 42;
|
||||
private static final LoadingCache<Long, List<SpikeFeature.EndSpike>> SPIKE_CACHE = CacheBuilder.newBuilder().expireAfterWrite(5L, TimeUnit.MINUTES).build(new SpikeFeature.SpikeCacheLoader());
|
||||
+ private Random rnd; // Purpur
|
||||
|
||||
public SpikeFeature(Codec<SpikeConfiguration> configCodec) {
|
||||
super(configCodec);
|
||||
}
|
||||
|
||||
public static List<SpikeFeature.EndSpike> getSpikesForLevel(WorldGenLevel world) {
|
||||
- Random random = new Random(world.getSeed());
|
||||
+ int seed = net.pl3x.purpur.PurpurConfig.endSpikeSeed; // Purpur
|
||||
+ Random random = new Random(seed == -1 ? world.getSeed() : seed); // Purpur
|
||||
long l = random.nextLong() & 65535L;
|
||||
return SPIKE_CACHE.getUnchecked(l);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean place(FeaturePlaceContext<SpikeConfiguration> context) {
|
||||
+ // Purpur start
|
||||
+ if (this.rnd == null) {
|
||||
+ int seed = net.pl3x.purpur.PurpurConfig.endSpikeSeed;
|
||||
+ this.rnd = seed == -1 ? context.random() : new Random(seed);
|
||||
+ }
|
||||
+ // Purpur end
|
||||
SpikeConfiguration spikeConfiguration = context.config();
|
||||
WorldGenLevel worldGenLevel = context.level();
|
||||
- Random random = context.random();
|
||||
+ Random random = this.rnd; // Purpur
|
||||
BlockPos blockPos = context.origin();
|
||||
List<SpikeFeature.EndSpike> list = spikeConfiguration.getSpikes();
|
||||
if (list.isEmpty()) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index fa1af3c9da4fee4c529113b30f652c3243e73635..4102856324b9f5bd683175c0662309366fe9e3c8 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -1,5 +1,6 @@
|
||||
package net.pl3x.purpur;
|
||||
|
||||
+import co.aikar.timings.TimingsManager;
|
||||
import com.google.common.base.Throwables;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.pl3x.purpur.command.PurpurCommand;
|
||||
@@ -147,6 +148,19 @@ public class PurpurConfig {
|
||||
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
|
||||
}
|
||||
|
||||
+ public static int dungeonSeed = -1;
|
||||
+ public static int endSpikeSeed = -1;
|
||||
+ public static int geodeSeed = -1;
|
||||
+ private static void seedSettings() {
|
||||
+ dungeonSeed = getInt("settings.seed.dungeon", dungeonSeed);
|
||||
+ endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed);
|
||||
+ geodeSeed = getInt("settings.seed.geode", geodeSeed);
|
||||
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
|
||||
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed.dungeon")) TimingsManager.hiddenConfigs.add("settings.seed.dungeon");
|
||||
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed.end-spike")) TimingsManager.hiddenConfigs.add("settings.seed.end-spike");
|
||||
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed.geode")) TimingsManager.hiddenConfigs.add("settings.seed.geode");
|
||||
+ }
|
||||
+
|
||||
public static String serverModName = "Purpur";
|
||||
private static void serverModName() {
|
||||
serverModName = getString("settings.server-mod-name", serverModName);
|
||||
@@ -1,53 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Wed, 15 Jul 2020 12:40:25 -0500
|
||||
Subject: [PATCH] Configurable dungeon seed
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
|
||||
index d36b6208077254af5f0ebed8e8ce20fd45cbb79d..612bc6e4a759df96bade4c322aad0b3e8753e0ee 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
|
||||
@@ -25,6 +25,7 @@ public class MonsterRoomFeature extends Feature<NoneFeatureConfiguration> {
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
private static final EntityType<?>[] MOBS = new EntityType[]{EntityType.SKELETON, EntityType.ZOMBIE, EntityType.ZOMBIE, EntityType.SPIDER};
|
||||
private static final BlockState AIR = Blocks.CAVE_AIR.defaultBlockState();
|
||||
+ private Random rnd; // Purpur
|
||||
|
||||
public MonsterRoomFeature(Codec<NoneFeatureConfiguration> configCodec) {
|
||||
super(configCodec);
|
||||
@@ -32,9 +33,15 @@ public class MonsterRoomFeature extends Feature<NoneFeatureConfiguration> {
|
||||
|
||||
@Override
|
||||
public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> context) {
|
||||
+ // Purpur start
|
||||
+ if (this.rnd == null) {
|
||||
+ int seed = net.pl3x.purpur.PurpurConfig.dungeonSeed;
|
||||
+ this.rnd = seed == -1 ? context.random() : new Random(seed);
|
||||
+ }
|
||||
+ // Purpur end
|
||||
Predicate<BlockState> predicate = Feature.isReplaceable(BlockTags.FEATURES_CANNOT_REPLACE.getName());
|
||||
BlockPos blockPos = context.origin();
|
||||
- Random random = context.random();
|
||||
+ Random random = this.rnd; // Purpur
|
||||
WorldGenLevel worldGenLevel = context.level();
|
||||
int i = 3;
|
||||
int j = random.nextInt(2) + 2;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index d6f5b2d0ae5f75e07a3879741ed0bae9def1eb3a..1e5bd8a72be6d082f8bb56c22eb7372ad7b14129 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -148,10 +148,13 @@ public class PurpurConfig {
|
||||
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
|
||||
}
|
||||
|
||||
+ public static int dungeonSeed = -1;
|
||||
public static int endSpikeSeed = -1;
|
||||
private static void seedSettings() {
|
||||
+ dungeonSeed = getInt("settings.seed.dungeon", dungeonSeed);
|
||||
endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed);
|
||||
if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
|
||||
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed.dungeon")) TimingsManager.hiddenConfigs.add("settings.seed.dungeon");
|
||||
if (!TimingsManager.hiddenConfigs.contains("settings.seed.end-spike")) TimingsManager.hiddenConfigs.add("settings.seed.end-spike");
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
index fcb383cea17217b6ee26fcd8b59e5ce6a7ca0f8e..782d4499f925950d66072b63f34a828bcc51d2e7 100644
|
||||
index ddd48367c37d3ca3472fc9a8730f71f2e96743c2..007437edff2db6044adf9afca4a098509d007edf 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||||
@@ -51,6 +51,7 @@ public class Phantom extends FlyingMob implements Enemy {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index f4eb8ea592e259bca1b961bbbf3f99c9cb058640..c3aa354635d7e784726ec5086e652433c8f461b1 100644
|
||||
index d96c4d52282e69180273322cb9a83f7365667fe3..0fa7a658af3dc1766e06d90d396a426c558917ab 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -1516,6 +1516,19 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -117,10 +117,10 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 1e5bd8a72be6d082f8bb56c22eb7372ad7b14129..922b8a3b0d9aa0481245a34ac35822657435ce8b 100644
|
||||
index 4102856324b9f5bd683175c0662309366fe9e3c8..4020c996730fb39ed8c1e40a9c235c2aaade7a27 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -208,6 +208,15 @@ public class PurpurConfig {
|
||||
@@ -211,6 +211,15 @@ public class PurpurConfig {
|
||||
allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow anvil colors
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
|
||||
index 2db80c986e1dbd4aa9be288cc802f650169dc11a..1d186f9e3c2b10420abf8b3334cbcc420fc51abb 100644
|
||||
index c81af461fa01dac0b7b26becc1a5e7ae31bb5f95..2dbc71a3d76cc87e2683b8f351bd8db04481855e 100644
|
||||
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
|
||||
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
|
||||
@@ -2,6 +2,9 @@ package net.minecraft.world.inventory;
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Add no-random-tick block list
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
index 14c3e9fcdfb088d3fe0a15266b50a7da82a5d240..0ef7b405ad9174045128fb5445f0bc0e22a3f2e2 100644
|
||||
index 56d6992fed812208b4cb04e4c9f9fc6636d2f7a4..3ecefe8dbde7ab2a83e62436808740380a1ecc48 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -318,7 +318,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||||
@@ -31,7 +31,7 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342
|
||||
if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
|
||||
for (int i = 0; i < 64; ++i) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 922b8a3b0d9aa0481245a34ac35822657435ce8b..8d788bd4b3a2c95e6eee529ae22cb4e7d29d270a 100644
|
||||
index 4020c996730fb39ed8c1e40a9c235c2aaade7a27..4c5a52d848ebc37f5543988485f0330812a8ea93 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -3,6 +3,8 @@ package net.pl3x.purpur;
|
||||
@@ -43,7 +43,7 @@ index 922b8a3b0d9aa0481245a34ac35822657435ce8b..8d788bd4b3a2c95e6eee529ae22cb4e7
|
||||
import net.pl3x.purpur.command.PurpurCommand;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
@@ -198,6 +200,12 @@ public class PurpurConfig {
|
||||
@@ -201,6 +203,12 @@ public class PurpurConfig {
|
||||
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
|
||||
private final LevelAccessor level;
|
||||
private final Direction.Axis axis;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 8d788bd4b3a2c95e6eee529ae22cb4e7d29d270a..322c5ba72feed92f99731d9c4413b304ce59dd13 100644
|
||||
index 4c5a52d848ebc37f5543988485f0330812a8ea93..0f75e5e0f31433391559930b017fb0913bd46bbd 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -184,6 +184,7 @@ public class PurpurConfig {
|
||||
@@ -187,6 +187,7 @@ public class PurpurConfig {
|
||||
public static boolean barrelSixRows = false;
|
||||
public static boolean enderChestSixRows = false;
|
||||
public static boolean enderChestPermissionRows = false;
|
||||
@@ -29,7 +29,7 @@ index 8d788bd4b3a2c95e6eee529ae22cb4e7d29d270a..322c5ba72feed92f99731d9c4413b304
|
||||
private static void blockSettings() {
|
||||
if (version < 3) {
|
||||
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
|
||||
@@ -198,6 +199,7 @@ public class PurpurConfig {
|
||||
@@ -201,6 +202,7 @@ public class PurpurConfig {
|
||||
enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
|
||||
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
|
||||
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
|
||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
|
||||
In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
index 0ef7b405ad9174045128fb5445f0bc0e22a3f2e2..d10ebe9b094a0e8b62e6607a4fefaf0bcd412413 100644
|
||||
index 3ecefe8dbde7ab2a83e62436808740380a1ecc48..cf3e37ffe33af3711ef18483fb55770cc494c3d2 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory;
|
||||
@@ -94,7 +94,7 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
|
||||
if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
|
||||
blockposition1 = blockposition2;
|
||||
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||||
index 1fa4773cd86630ffb68be99a49f6ede49205cf59..0e7f957024666126c560757831ad1a6d6d890b10 100644
|
||||
index d339f0c9d37827887de5236cf3da801e3fe9127b..d23b3f22c05a10715e5c3305e7068dfc372e8d79 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||||
@@ -200,7 +200,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||||
@@ -27,7 +27,7 @@ index afe33f20578177cb517e1c116e6319481642e66c..fe4695adbb506733b4029ecfabcfda3d
|
||||
} else {
|
||||
user.startUsingItem(hand);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 9421df1069e16efd0bc121d1b433ae92d7e211ff..0c8619651858ee0920f5b301079bd23a1edbd26a 100644
|
||||
index 26ca63448f9c5feeb6b4d137b46239dc8c2ea420..a19a055ea1eec6155070f99e9c49421201316c06 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -107,6 +107,17 @@ public class PurpurWorldConfig {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index c443b850a512eae94d451521c5e9e0342aca2171..ff5b7c5f6cea71d541abf8a518aee347f2e00e85 100644
|
||||
index 0f8cafed9afbb801217b2adb91c270811e149913..4c703cb20c7fa638c2f578cef1cd9dca788b4569 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -897,7 +897,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
@@ -61,7 +61,7 @@ index 2ad5ff9a1d7de54e75436e99da8a73db9dc91bde..60605a8a021cc56f9c3ba22bc43c43c3
|
||||
} else if (blockState.is(Blocks.HONEY_BLOCK)) {
|
||||
return BlockPathTypes.STICKY_HONEY;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 0c8619651858ee0920f5b301079bd23a1edbd26a..f7c808830fecca2e4ad7b828db14e86173e33e58 100644
|
||||
index a19a055ea1eec6155070f99e9c49421201316c06..cd689953a4a9967fd507bc9f371d7e62c2ec0af6 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -430,6 +430,11 @@ public class PurpurWorldConfig {
|
||||
@@ -18,7 +18,7 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
|
||||
public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
|
||||
this.gameTime = time % 192000; // Paper - fix guardian beam
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
index d10ebe9b094a0e8b62e6607a4fefaf0bcd412413..97697f2ee49ef1f3b0bfb291b1df99f5681992af 100644
|
||||
index cf3e37ffe33af3711ef18483fb55770cc494c3d2..665a78503661922e98d6b2de380cda107ffd22de 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -55,6 +55,7 @@ import net.minecraft.network.protocol.game.ClientboundExplodePacket;
|
||||
@@ -80,7 +80,7 @@ index d10ebe9b094a0e8b62e6607a4fefaf0bcd412413..97697f2ee49ef1f3b0bfb291b1df99f5
|
||||
|
||||
public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index f7c808830fecca2e4ad7b828db14e86173e33e58..ac0aaf5d557e411bc29120470a80862c61c35bc5 100644
|
||||
index cd689953a4a9967fd507bc9f371d7e62c2ec0af6..c7b664e753c4ef53607f74ac24436ff6c8df32b2 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -89,6 +89,13 @@ public class PurpurWorldConfig {
|
||||
@@ -17,10 +17,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 322c5ba72feed92f99731d9c4413b304ce59dd13..c2d7bcb241f3930600c2c89eb9f11986fcbfc260 100644
|
||||
index 0f75e5e0f31433391559930b017fb0913bd46bbd..e93911c4041f8b4457f76e471f5a8e102cded339 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -202,6 +202,16 @@ public class PurpurConfig {
|
||||
@@ -205,6 +205,16 @@ public class PurpurConfig {
|
||||
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Infinite fuel furnace
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
|
||||
index c559ec5041474e585e4d95a664c84e1fa895cf16..806277d029a1c1a2d334a05d94163415c2619b8d 100644
|
||||
index 348e485897c34cca19113cc35f055a58778ca38b..1eab83cefdf1484b8cf80072d9a0ee61dea4fd6c 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
|
||||
@@ -40,6 +40,7 @@ import net.minecraft.world.level.Level;
|
||||
@@ -48,7 +48,7 @@ index c559ec5041474e585e4d95a664c84e1fa895cf16..806277d029a1c1a2d334a05d94163415
|
||||
|
||||
private static boolean canBurn(@Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index ac0aaf5d557e411bc29120470a80862c61c35bc5..25b3f33f487dd0cc25f9bdc335002f4601e138d2 100644
|
||||
index c7b664e753c4ef53607f74ac24436ff6c8df32b2..bb37ccea3237737cc717910e93f63a67ec972221 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -398,6 +398,11 @@ public class PurpurWorldConfig {
|
||||
@@ -24,7 +24,7 @@ index 97e5cb4fd9f97c0bfa9d66c0ceac84e134f1053f..e92f6ffcda47aad76ad647bc2ad3d186
|
||||
return;
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 25b3f33f487dd0cc25f9bdc335002f4601e138d2..5f45d06c06e4a077096273f05d932ab9d53e918e 100644
|
||||
index bb37ccea3237737cc717910e93f63a67ec972221..67491e34f5cdf3c0fdc860841f62af674f7c9757 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -394,8 +394,10 @@ public class PurpurWorldConfig {
|
||||
@@ -33,7 +33,7 @@ index 5a503a255b4e7e684a8f42d8190430397ca81683..7a90c6a628571730eee382e1efcfe1b9
|
||||
entityageable.setBaby(true);
|
||||
entityageable.moveTo(this.getX(), this.getY(), this.getZ(), 0.0F, 0.0F);
|
||||
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||||
index 0e7f957024666126c560757831ad1a6d6d890b10..4e6f79c21f02dc26a2eee9c1ed158bd68191ed5a 100644
|
||||
index d23b3f22c05a10715e5c3305e7068dfc372e8d79..fe1b85196d6a83adbae46eddbe7f8c2a50b1e175 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||||
@@ -185,6 +185,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||||
@@ -95,7 +95,7 @@ index 0e7f957024666126c560757831ad1a6d6d890b10..4e6f79c21f02dc26a2eee9c1ed158bd6
|
||||
this.world = new CraftWorld((ServerLevel) this, gen, env);
|
||||
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 5f45d06c06e4a077096273f05d932ab9d53e918e..b54797a5dad26113bcd3a2752378504e62b30b3d 100644
|
||||
index 67491e34f5cdf3c0fdc860841f62af674f7c9757..e804fdab0637c4a35968246463330eeb2376d7a9 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -330,6 +330,7 @@ public class PurpurWorldConfig {
|
||||
@@ -109,7 +109,7 @@ index 9da76357da891a70e20ad80f50873b3b487dc84c..c718697a9511ccf761467644967397b7
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
index d31b906c87e22f505bee22f21dd8ec1e047f6ffe..504ea27df8ce010728d73349a8daf66310968f38 100644
|
||||
index 406b6ed8084c18da1062d8e8049bdfff65101565..ba1bfad397d62dd6feccdbbe3288997cfe16ce84 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -176,6 +176,11 @@ public class Fox extends Animal {
|
||||
@@ -154,7 +154,7 @@ index e7818390e6b8130312fc5a607fae1d1fc094a36a..3d3f333a4c77d0d6e82a54aac190772d
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
index 4e979a8012b8b001c6a35c477c01d7da67583220..4e6e63ec2c5a9b86528f1a620ff7f0be90a7b3dc 100644
|
||||
index de0247899f0bf785a94e39e170c8e2fc8a58b590..3b8c3aaa7f8249dafea44b306583cf7f7dbbed5e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
|
||||
@@ -83,6 +83,11 @@ public class Ocelot extends Animal {
|
||||
@@ -168,7 +168,7 @@ index 4e979a8012b8b001c6a35c477c01d7da67583220..4e6e63ec2c5a9b86528f1a620ff7f0be
|
||||
+ }
|
||||
// Purpur end
|
||||
|
||||
boolean isTrusting() {
|
||||
public boolean isTrusting() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
index 13ef0071b98ad2b7654914b62711a661f14b2c42..e9859935a5f18d2c51020ce5772ecf7264787773 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155
|
||||
((Mob) newEntityLiving).setPersistenceRequired();
|
||||
// Paper end
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 7518fe1ba629e9bd17be3f687e62a030509faa12..65de0a66e81ad3fdf0f85d233512dd7bb1a8a416 100644
|
||||
index e1a58d2eac73f32c58dfc92cfd9710e385cf1173..dc02f93c4a34e8f52b05699073723529cee34b66 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -86,9 +86,11 @@ public class PurpurWorldConfig {
|
||||
@@ -82,7 +82,7 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 65de0a66e81ad3fdf0f85d233512dd7bb1a8a416..d2fdd697e46260d878712ab20cce5fe4aa456bbc 100644
|
||||
index dc02f93c4a34e8f52b05699073723529cee34b66..d0c574af9f7c487e9813d5b81c771ac57e200ee9 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -394,6 +394,11 @@ public class PurpurWorldConfig {
|
||||
@@ -103,7 +103,7 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca
|
||||
// Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index d2fdd697e46260d878712ab20cce5fe4aa456bbc..7a160dd754a666b676ff6b61408bffeea2088e15 100644
|
||||
index d0c574af9f7c487e9813d5b81c771ac57e200ee9..e46deed65f34a8d7445c74cea4d37e9cdb900846 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -395,8 +395,10 @@ public class PurpurWorldConfig {
|
||||
@@ -21,7 +21,7 @@ index 5ebedd6a156b06e98aded57c817f63429a1ae380..c99d295b999a28dd1eb504179250445d
|
||||
|
||||
private static class EndermanFreezeWhenLookedAt extends Goal {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 7a160dd754a666b676ff6b61408bffeea2088e15..c73cd7de9213851825adc0a5e76107102dab2354 100644
|
||||
index e46deed65f34a8d7445c74cea4d37e9cdb900846..0b57449ce9f8af036a90047c00d2c90963ed1ca7 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -766,6 +766,7 @@ public class PurpurWorldConfig {
|
||||
@@ -18,7 +18,7 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 35114bb65efc940dc44e93546152580bbc9be9e3..94302930c2009ca9c4750cb3315b5bcce59518da 100644
|
||||
index 0b57449ce9f8af036a90047c00d2c90963ed1ca7..21850e0aa760b6e4f0d88515cf917676b1ed4f3a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -272,6 +272,11 @@ public class PurpurWorldConfig {
|
||||
@@ -18,7 +18,7 @@ index 2ca0c22a23916acd034f70edc9d94ea22bbd0b52..e0fa000738d2fb4472056e973159e40d
|
||||
} else {
|
||||
this.setLeftHanded(false);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index aba5325f96a396be479445730558235529afdcec..5466cb48c7d71e6c369e17a354b877ff73091544 100644
|
||||
index 77b1d0429712ccfc5560f96639b872c4f9b35600..36cb6ffe08b9e9140a182b33763f40437b49decc 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -115,8 +115,10 @@ public class PurpurWorldConfig {
|
||||
@@ -20,10 +20,10 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12
|
||||
itemStack.setCount(1);
|
||||
ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index c2d7bcb241f3930600c2c89eb9f11986fcbfc260..0e83d4f434225a5916104a9a14c0913eaafc04c6 100644
|
||||
index e93911c4041f8b4457f76e471f5a8e102cded339..b3c7ad62159184e324eb397f538926dcb4ce0746 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -181,6 +181,11 @@ public class PurpurConfig {
|
||||
@@ -184,6 +184,11 @@ public class PurpurConfig {
|
||||
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ index d980a556785b52fe827310b83638139df0816b11..3c8c02fc92374def12254f7ffad604b2
|
||||
|
||||
return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 406a56c51e85bfda195d56c67da66c476219b1e4..2426b506b1edb013a386d99f5981faca850c1824 100644
|
||||
index 449d5f9de232adcbeb72ba9d840da6f503f9af9d..fd2a79583c73014944cdbda3f0cb1e9b2ea214e6 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -412,6 +412,11 @@ public class PurpurWorldConfig {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index b9cbbd3c69ef9e14905873f9e4ce3104026e5390..e41b54f54e0d7e2fe8e68fad8656d0d7c60d5d03 100644
|
||||
index 1c4639b95ef5ef4bad18834d651744152b8ce392..8651f9e288bc955dbbe02fbd3abf12e3826a89e8 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -1083,6 +1083,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
@@ -26,7 +26,7 @@ index 328a9849bb601e1cc9fd31066c2313f9bdfa07b8..dc5ce9a61a20870f4321412ea1e78cc4
|
||||
|
||||
protected ItemCooldowns createItemCooldowns() {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 5ac846ec65890394d8460aff3f9453cd1baabbd3..d4813180eeb1dcb004b0ba0baf892567cd36725e 100644
|
||||
index ad1e00a21015655d1d93a3fb09dc212550e3cb0b..2889fefb433b7a7611eb8a168ad5de671cc342b4 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -253,6 +253,19 @@ public class PurpurWorldConfig {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index c3aa354635d7e784726ec5086e652433c8f461b1..48c32591f7193cb3d35f2675cbc97ac3a0212757 100644
|
||||
index 0fa7a658af3dc1766e06d90d396a426c558917ab..5c82dd279fc3a5847e2e0ed6c9cf9e70acfb3bff 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -1674,7 +1674,7 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -92,7 +92,7 @@ index ac5779319081a6894373877067edf958da8a9cf5..24227a18ea1d0c06e2049542c8ca9c82
|
||||
} else if (this.nextStartTick > 0) {
|
||||
--this.nextStartTick;
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
index 504ea27df8ce010728d73349a8daf66310968f38..bde08d3e2eb22039548f8dd19c30aa6cf551520d 100644
|
||||
index ba1bfad397d62dd6feccdbbe3288997cfe16ce84..5750b42a3f522402e9cea573204cf31f6ab0c287 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
|
||||
@@ -1346,7 +1346,7 @@ public class Fox extends Animal {
|
||||
@@ -22,7 +22,7 @@ index d3c8fd8399629efb8bcbaf7d9a0c43340fcdfeda..c74df3b5c2a25469ad3fb6a853438bbc
|
||||
org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
|
||||
if (!event.isCancelled()) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 288d42cdfb3d89b5fdb956606c91ebd914969ce0..18eac861d4cdc3ab7b9b078254d73da244965deb 100644
|
||||
index fa8bc169febef0f0513c584d558238cc28decfac..dfcd0ee48e178c85bb64134e261f82faf9292a0e 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -354,6 +354,7 @@ public class PurpurWorldConfig {
|
||||
@@ -78,7 +78,7 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07
|
||||
|
||||
blockEntity.teleportCooldown = 100;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 18eac861d4cdc3ab7b9b078254d73da244965deb..e2da11f256a24e583d6294dda341f238668db408 100644
|
||||
index dfcd0ee48e178c85bb64134e261f82faf9292a0e..5f6cd91f7eda35f1e0310ec76f7380e3b1e237d3 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -353,6 +353,7 @@ public class PurpurWorldConfig {
|
||||
@@ -37,7 +37,7 @@ index 5b15275c8d808916a1506a19a8bc29103adedae9..3b170886d42df4c217b565f54b1c6272
|
||||
if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
|
||||
return;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index fc8bd53e71bbba7ea02f38df14e182697cfcf699..6de54168c90225465f6ab353fdbb84fb576d8685 100644
|
||||
index 5f6cd91f7eda35f1e0310ec76f7380e3b1e237d3..faed827a793ed026a223de00130199438776b070 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -450,10 +450,16 @@ public class PurpurWorldConfig {
|
||||
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 478dbfe8eeff9e6e03f77a00869df06b5a1eda3c..5ad88dccb7fdc2630a273e6645f8612079c51fd2 100644
|
||||
index 98eeee9eb047d607d353c6c0efcf06fcd4b32bde..58990260fca555eae661b76d0fcc016667c225cc 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -1402,7 +1402,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
@@ -59,7 +59,7 @@ index 518dd0e6b4889c049e438b393baa795a5eac3e7d..21e154c4e7fe261a41c891b481072fbd
|
||||
this.navigation.stop();
|
||||
this.setTarget((LivingEntity) null);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 58338f0d1c1cdd153ce90e79ad4ae2725622752e..930adab7d6d387c935cb9e8d974d4fdf048871be 100644
|
||||
index 442245807f734231256c9eedf1ed03c15ce84e7b..6e7d318b3db3efc572d4075cf0ee4f139cc48768 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -355,6 +355,7 @@ public class PurpurWorldConfig {
|
||||
@@ -52,7 +52,7 @@ index 92e65f3fbc8f5d77bb8cc31e7a7780c2589f4227..0c46507ab0b904fb1f79bc5421c88c03
|
||||
|
||||
this.onDestroyedBy(source);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index ab16826ca6515df75d2656700c0e0d9f5834eaae..c3bf38fda276d05be4864ba67778c4ba7dae0b21 100644
|
||||
index 6e7d318b3db3efc572d4075cf0ee4f139cc48768..3cca0436d664fc19779ade69a8b961b678674895 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -457,6 +457,35 @@ public class PurpurWorldConfig {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index e41b54f54e0d7e2fe8e68fad8656d0d7c60d5d03..8e7d6e0298c2db89c8a20740df9eb64acd70639b 100644
|
||||
index 8651f9e288bc955dbbe02fbd3abf12e3826a89e8..62643b2b110d449b7b70bf9ae68b01ff9e8d4a80 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -1518,6 +1518,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
||||
@@ -22,7 +22,7 @@ index e41b54f54e0d7e2fe8e68fad8656d0d7c60d5d03..8e7d6e0298c2db89c8a20740df9eb64a
|
||||
this.lastGoodX = this.player.getX();
|
||||
this.lastGoodY = this.player.getY();
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 814dab20834481fccdae8e8f0962bffa3b8f1d8a..ea461a88824b7a777fae8fe05b27e23a9faf79f0 100644
|
||||
index 78763c53bafc3bd5a142acf530342af8fad363c6..4d82f5f9c9a6b2ce4079fea1b3fb4279c342015f 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -143,6 +143,8 @@ public class PurpurWorldConfig {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] One Punch Man!
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 48c32591f7193cb3d35f2675cbc97ac3a0212757..355f741dfdbe5ef9a4ef36feb3c3ffee052f123f 100644
|
||||
index 5c82dd279fc3a5847e2e0ed6c9cf9e70acfb3bff..c123e723d4fc3202eb7a4c74a356ffcde19e2ba5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -2116,6 +2116,20 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -30,7 +30,7 @@ index 48c32591f7193cb3d35f2675cbc97ac3a0212757..355f741dfdbe5ef9a4ef36feb3c3ffee
|
||||
if (human) {
|
||||
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index ea461a88824b7a777fae8fe05b27e23a9faf79f0..1e5589f8ece209fd77519d8afc6339b13f489834 100644
|
||||
index 4d82f5f9c9a6b2ce4079fea1b3fb4279c342015f..2aeb06b6372d954ee66a0dfd62af3396e4c97a31 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -287,6 +287,7 @@ public class PurpurWorldConfig {
|
||||
@@ -29,7 +29,7 @@ index 0169d874247a96c2e10a65ecb9c0c093f5a6ecfb..b760e2d014b3ae70671878082bb853b7
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 677a347062bbf6b8c1da0697bcc24d427ec43553..6027e589df5d8bcd3c5088affc9b71f3a1613791 100644
|
||||
index 2aeb06b6372d954ee66a0dfd62af3396e4c97a31..ef9750f815bdb858ab1efdb540eebf59fde7a5f3 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -512,6 +512,11 @@ public class PurpurWorldConfig {
|
||||
@@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f
|
||||
// Paper end
|
||||
if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 3dd239cda6a5d54ac5ca62d9b91860728f2c4a25..6d849b9f42858f7ac692eefcac7d788700212ba9 100644
|
||||
index ef9750f815bdb858ab1efdb540eebf59fde7a5f3..090c09763ab8039fd06cea32c1c57ae7e06b96a8 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -145,6 +145,10 @@ public class PurpurWorldConfig {
|
||||
@@ -19,7 +19,7 @@ index 3907b7cb559dabdd3cc347678d42071215c66a6c..91e23061ed8d40ba36cb8f10fc9ccbe4
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 8d5b3b98a5c886f6336951e6642f708d40970382..6857bc0bb1c0a4ff7164ad6784dabbd36ae745b1 100644
|
||||
index a672c4e0c6da0e0fc82d0c445c0a31bbb56a9fb6..b42f630fcf421b765afa17598172e8ee1c2bc06d 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -894,6 +894,7 @@ public class PurpurWorldConfig {
|
||||
@@ -20,7 +20,7 @@ index 91e23061ed8d40ba36cb8f10fc9ccbe482d2b893..a3d9a3182d76141cb7c0f8aaf601e149
|
||||
} else {
|
||||
Vec3 vec3d = player.getViewVector(1.0F).normalize();
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 6857bc0bb1c0a4ff7164ad6784dabbd36ae745b1..91991a73f9ad30ad89d4c704bd8e204685bbbcf5 100644
|
||||
index b42f630fcf421b765afa17598172e8ee1c2bc06d..d830d651c41456a598a1da949ef98cefde476d20 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -895,6 +895,8 @@ public class PurpurWorldConfig {
|
||||
@@ -36,7 +36,7 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index ee1a1c2ba22b48a7206b08e837e48d61dec21b52..3f7ccc8dad37de39520377f34b9d692830159f36 100644
|
||||
index d830d651c41456a598a1da949ef98cefde476d20..11cb5942c958219b27324127d883edad957e64a4 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -384,6 +384,7 @@ public class PurpurWorldConfig {
|
||||
@@ -50,7 +50,7 @@ index c550b8c19837ed9bf730a3eb777bc00de4e7ceb2..02494dcc8a342f65b2855612aebeb019
|
||||
|
||||
private void spawnLingeringCloud() {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 28a6585e8a20ebd993cd1c20001760fa3b28685d..d5bf649e4643da234cd76d959d7c2b892535dbd1 100644
|
||||
index a310c53c70f40f6f272759bf3899b2742ce06879..b717f636c1eb57e4b3d78b147c76e6cf7fa8ee22 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -769,6 +769,7 @@ public class PurpurWorldConfig {
|
||||
@@ -62,7 +62,7 @@ index 4c9ae6bdb2f0358798f84928271a2d783dcba7b4..47bf769a031ae39cc72d2191195d1378
|
||||
int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 1fb80872de9ba8f4d0851da8c2aed992f55c1e08..098154a67bdfa17086d03d0e10fb1f0e07454e60 100644
|
||||
index 3bddca7e070f1a38454c43f63bc7d62be90f1329..30fc8f9c28dadf0bfe635a630f1fb952f8f9f0dd 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -468,6 +468,11 @@ public class PurpurWorldConfig {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
index 97697f2ee49ef1f3b0bfb291b1df99f5681992af..16f5ef16971e2535f5001929925267a08955edb4 100644
|
||||
index 665a78503661922e98d6b2de380cda107ffd22de..48fd3ed38ae5961041276cd7b97bd36b4d3521d0 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -580,7 +580,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||||
@@ -18,7 +18,7 @@ index 97697f2ee49ef1f3b0bfb291b1df99f5681992af..16f5ef16971e2535f5001929925267a0
|
||||
long l = this.levelData.getDayTime() + 24000L;
|
||||
TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime());
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index c54fd7f6fce56809ed7cd079ad5e106cad9d909a..b32e285c77ce7d67583339941487a522dbe566dd 100644
|
||||
index 30fc8f9c28dadf0bfe635a630f1fb952f8f9f0dd..c8f4b025a20bd8d6dee4808e597e1e5e295149cc 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -297,6 +297,7 @@ public class PurpurWorldConfig {
|
||||
@@ -59,10 +59,10 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757
|
||||
|
||||
public abstract boolean canEnchant(Item item);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index 0e83d4f434225a5916104a9a14c0913eaafc04c6..e4f19ff7c1cf56f014432aba9e2f8788b48f75fb 100644
|
||||
index b3c7ad62159184e324eb397f538926dcb4ce0746..c926650327c014d7d63b0f7ccbcdbeacd052edcc 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -208,6 +208,7 @@ public class PurpurConfig {
|
||||
@@ -211,6 +211,7 @@ public class PurpurConfig {
|
||||
}
|
||||
|
||||
public static boolean allowInfinityMending = false;
|
||||
@@ -70,7 +70,7 @@ index 0e83d4f434225a5916104a9a14c0913eaafc04c6..e4f19ff7c1cf56f014432aba9e2f8788
|
||||
private static void enchantmentSettings() {
|
||||
if (version < 5) {
|
||||
boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
|
||||
@@ -215,6 +216,7 @@ public class PurpurConfig {
|
||||
@@ -218,6 +219,7 @@ public class PurpurConfig {
|
||||
set("settings.enchantment.allow-infinite-and-mending-together", null);
|
||||
}
|
||||
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
|
||||
@@ -47,7 +47,7 @@ index eb7f8907bb362c0461194bbaf62917ce71c669f3..89f5e0d26500f1806dff9f91390546cd
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 4983410ec62d65bffacbb62491ea455db14dc343..fd484089d1f7d6644780a353ab12d18636b3249d 100644
|
||||
index 306fe7e45673d2e0f0050bf1444464a4d73ef9a4..f0b9f46b5f5d80bec34ea4d6495d0d995287981b 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -589,6 +589,11 @@ public class PurpurWorldConfig {
|
||||
@@ -22,7 +22,7 @@ index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899
|
||||
return false;
|
||||
} else {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index fd484089d1f7d6644780a353ab12d18636b3249d..6bf7165870ef252ca2d69584d0f187dc751ece30 100644
|
||||
index f0b9f46b5f5d80bec34ea4d6495d0d995287981b..374bac7b76b15f99dadfea3264b7bf58a542311a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -541,8 +541,12 @@ public class PurpurWorldConfig {
|
||||
@@ -17,7 +17,7 @@ index d119f8ab447bc17deabc494463de496161c9b126..c9a44a4765f43b9c0247ed1005f4c134
|
||||
|
||||
public ArmorStand(Level world, double x, double y, double z) {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 1f631f1f9a03ff1c0fcfc48337b04fefeadb8f06..37a7d6a950282435e78438b7d51c43dc63d890e3 100644
|
||||
index 374bac7b76b15f99dadfea3264b7bf58a542311a..89f4f81cc05b59efeec025fccd38608c08888796 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -92,6 +92,7 @@ public class PurpurWorldConfig {
|
||||
@@ -67,7 +67,7 @@ index c903a1a8d2234bb0fa354d1c44ff3ab2275b04c7..d01e4064a772710c1383927e0848b9b3
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 9636564028b75d7adbead873ee34cedbef9ec6d3..b6734d074e326fbeb3fc25343af1e88e37664959 100644
|
||||
index 89f4f81cc05b59efeec025fccd38608c08888796..0bd0675362a7b7164f9dd4ce8beb42623c1f077a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -493,6 +493,16 @@ public class PurpurWorldConfig {
|
||||
@@ -44,10 +44,10 @@ index 5bd25f8b8a554b965665b3f5686c14189b51f28e..4be9924556e0f447dbe6a53c2d4cb7fb
|
||||
this.getOrCreateTag().put(key, tag);
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
index e4f19ff7c1cf56f014432aba9e2f8788b48f75fb..076f98308c788ed77e829020da1343a45cb8a175 100644
|
||||
index c926650327c014d7d63b0f7ccbcdbeacd052edcc..0960670278f907817a83455e242eb13935a99fc8 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
||||
@@ -209,6 +209,7 @@ public class PurpurConfig {
|
||||
@@ -212,6 +212,7 @@ public class PurpurConfig {
|
||||
|
||||
public static boolean allowInfinityMending = false;
|
||||
public static boolean allowCrossbowInfinity = false;
|
||||
@@ -55,7 +55,7 @@ index e4f19ff7c1cf56f014432aba9e2f8788b48f75fb..076f98308c788ed77e829020da1343a4
|
||||
private static void enchantmentSettings() {
|
||||
if (version < 5) {
|
||||
boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
|
||||
@@ -217,6 +218,7 @@ public class PurpurConfig {
|
||||
@@ -220,6 +221,7 @@ public class PurpurConfig {
|
||||
}
|
||||
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
|
||||
allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
|
||||
@@ -43,7 +43,7 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index b6734d074e326fbeb3fc25343af1e88e37664959..3926ec4b6081b6a8253b1fad87ffd9a859d2da31 100644
|
||||
index 0bd0675362a7b7164f9dd4ce8beb42623c1f077a..203c28c0b8a28b4727c2685ff31f4e9e88c46d63 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -615,6 +615,13 @@ public class PurpurWorldConfig {
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user