Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary copying of BlockPosition

Browse Source
This commit is contained in:
jmp
2020-09-09 08:51:40 -07:00
committed by BillyGalbreath
parent 88ae09d686
commit 36672d6bf2
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patches/server/0126-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -6,10 +6,10 @@ 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. 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/MobSpawnerTrader.java b/src/main/java/net/minecraft/server/MobSpawnerTrader.java diff --git a/src/main/java/net/minecraft/server/MobSpawnerTrader.java b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
index 502cb0ea4..a9eeddb81 100644 index 502cb0ea40..f88c7b5480 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java --- a/src/main/java/net/minecraft/server/MobSpawnerTrader.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerTrader.java +++ b/src/main/java/net/minecraft/server/MobSpawnerTrader.java
@@ -122,10 +122,20 @@ public class MobSpawnerTrader implements MobSpawner { @@ -122,7 +122,17 @@ public class MobSpawnerTrader implements MobSpawner {
int k = blockposition.getX() + this.a.nextInt(i * 2) - i; int k = blockposition.getX() + this.a.nextInt(i * 2) - i;
int l = blockposition.getZ() + this.a.nextInt(i * 2) - i; int l = blockposition.getZ() + this.a.nextInt(i * 2) - i;
int i1 = iworldreader.a(HeightMap.Type.WORLD_SURFACE, k, l); int i1 = iworldreader.a(HeightMap.Type.WORLD_SURFACE, k, l);
@@ -24,17 +24,12 @@ index 502cb0ea4..a9eeddb81 100644
+ blockposition2.c(EnumDirection.DOWN); + blockposition2.c(EnumDirection.DOWN);
+ } while (iworldreader.getType(blockposition2).isAir() && blockposition2.getY() > 0); + } while (iworldreader.getType(blockposition2).isAir() && blockposition2.getY() > 0);
+ } + }
- if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
- blockposition1 = blockposition2;
+ if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2.immutableCopy(), EntityTypes.WANDERING_TRADER)) {
+ blockposition1 = blockposition2.immutableCopy();
+ // Purpur end + // Purpur end
break;
} if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
} blockposition1 = blockposition2;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 77c72ec9f..b1b376ba8 100644 index 77c72ec9fa..b1b376ba86 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -128,7 +128,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -128,7 +128,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -47,7 +42,7 @@ index 77c72ec9f..b1b376ba8 100644
this.generator = gen; this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env); this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e4f2b8494..83f1be960 100644 index 0a024bb5c6..4f00bbe5ae 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -322,7 +322,24 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -322,7 +322,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -77,7 +72,7 @@ index e4f2b8494..83f1be960 100644
this.worldDataServer = (WorldDataServer) iworlddataserver; this.worldDataServer = (WorldDataServer) iworlddataserver;
worldDataServer.world = this; worldDataServer.world = this;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 11a5795f5..755a46ee8 100644 index 11a5795f51..755a46ee8b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry; @@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry;