Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-14 20:10:05 +01:00
Merge branch 'master' into pre/1.13
Dieser Commit ist enthalten in:
Commit
12cf81881c
69
Spigot-API-Patches/0142-isChunkGenerated-API.patch
Normale Datei
69
Spigot-API-Patches/0142-isChunkGenerated-API.patch
Normale Datei
@ -0,0 +1,69 @@
|
||||
From 1d78f754a14a5159a408adc552b3f04f2ccef37c Mon Sep 17 00:00:00 2001
|
||||
From: cswhite2000 <18whitechristop@gmail.com>
|
||||
Date: Tue, 21 Aug 2018 19:39:46 -0700
|
||||
Subject: [PATCH] isChunkGenerated API
|
||||
|
||||
Resolves #1329
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
||||
index 7e1ee875..9457832b 100644
|
||||
--- a/src/main/java/org/bukkit/Location.java
|
||||
+++ b/src/main/java/org/bukkit/Location.java
|
||||
@@ -9,6 +9,7 @@ import org.bukkit.util.NumberConversions;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
// Paper start
|
||||
+import com.google.common.base.Preconditions;
|
||||
import java.util.Collection;
|
||||
import java.util.function.Predicate;
|
||||
import org.bukkit.entity.Entity;
|
||||
@@ -502,6 +503,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
||||
public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
|
||||
|
||||
// Paper start
|
||||
+ /**
|
||||
+ * Checks if a {@link Chunk} has been generated at this location.
|
||||
+ *
|
||||
+ * @return true if a chunk has been generated at this location
|
||||
+ */
|
||||
+ public boolean isGenerated() {
|
||||
+ Preconditions.checkNotNull(world, "Location has no world!");
|
||||
+ return world.isChunkGenerated(locToBlock(x) >> 4, locToBlock(z) >> 4);
|
||||
+ }
|
||||
|
||||
/**
|
||||
* Sets the position of this Location and returns itself
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 3170a074..4fd4f997 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -181,6 +181,26 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
public default Chunk getChunkAt(long chunkKey) {
|
||||
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
|
||||
}
|
||||
+
|
||||
+ /**
|
||||
+ * Checks if a {@link Chunk} has been generated at the specified chunk key,
|
||||
+ * which is the X and Z packed into a long.
|
||||
+ *
|
||||
+ * @param chunkKey The Chunk Key to look up the chunk by
|
||||
+ * @return true if the chunk has been generated, otherwise false
|
||||
+ */
|
||||
+ public default boolean isChunkGenerated(long chunkKey) {
|
||||
+ return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Checks if a {@link Chunk} has been generated at the given coordinates.
|
||||
+ *
|
||||
+ * @param x X-coordinate of the chunk
|
||||
+ * @param z Z-coordinate of the chunk
|
||||
+ * @return true if the chunk has been generated, otherwise false
|
||||
+ */
|
||||
+ public boolean isChunkGenerated(int x, int z);
|
||||
// Paper end
|
||||
|
||||
/**
|
||||
--
|
||||
2.18.0
|
||||
|
48
Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch
Normale Datei
48
Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch
Normale Datei
@ -0,0 +1,48 @@
|
||||
From ec28d0096abe5a6c16d25d2853b4e488f0290f53 Mon Sep 17 00:00:00 2001
|
||||
From: Sotr <i@omc.hk>
|
||||
Date: Thu, 23 Aug 2018 16:14:25 +0800
|
||||
Subject: [PATCH] Add source block to BlockPhysicsEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
|
||||
index 5e47eabe..9d9e4712 100644
|
||||
--- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
|
||||
@@ -29,10 +29,34 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private final BlockData changed;
|
||||
private boolean cancel = false;
|
||||
+ // Paper start - add source block
|
||||
+ private int sourceX;
|
||||
+ private int sourceY;
|
||||
+ private int sourceZ;
|
||||
+ private Block sourceBlock;
|
||||
+
|
||||
+ public BlockPhysicsEvent(final Block block, final BlockData changed, final int sourceX, final int sourceY, final int sourceZ) {
|
||||
+ this(block, changed);
|
||||
+ this.sourceX = sourceX;
|
||||
+ this.sourceY = sourceY;
|
||||
+ this.sourceZ = sourceZ;
|
||||
+ this.sourceBlock = null;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Gets the source block, causing this event
|
||||
+ *
|
||||
+ * @return Source block
|
||||
+ */
|
||||
+ public Block getSourceBlock() {
|
||||
+ return sourceBlock == null ? (sourceBlock = block.getWorld().getBlockAt(sourceX, sourceY, sourceZ)) : sourceBlock;
|
||||
+ }
|
||||
+ // Paper end
|
||||
|
||||
public BlockPhysicsEvent(final Block block, final BlockData changed) {
|
||||
super(block);
|
||||
this.changed = changed;
|
||||
+ this.sourceBlock = block; // Paper - add source block
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
2.18.0
|
||||
|
44
Spigot-Server-Patches/0351-isChunkGenerated-API.patch
Normale Datei
44
Spigot-Server-Patches/0351-isChunkGenerated-API.patch
Normale Datei
@ -0,0 +1,44 @@
|
||||
From cca0a12cca8a970b2a885d93e976d9159b2072ad Mon Sep 17 00:00:00 2001
|
||||
From: cswhite2000 <18whitechristop@gmail.com>
|
||||
Date: Tue, 21 Aug 2018 19:44:10 -0700
|
||||
Subject: [PATCH] isChunkGenerated API
|
||||
|
||||
Resolves #1329
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 0e0c7b1ab..cb4a2a0b9 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -74,6 +74,12 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
|
||||
}
|
||||
|
||||
+ // Paper start
|
||||
+ public boolean isChunkGenerated(int x, int z) {
|
||||
+ return this.chunks.containsKey(ChunkCoordIntPair.asLong(x, z)) || this.chunkLoader.chunkExists(x, z);
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
@Nullable
|
||||
public Chunk getLoadedChunkAt(int i, int j) {
|
||||
long k = ChunkCoordIntPair.a(i, j);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index aa0b1f5fa..9a78fa687 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -612,6 +612,12 @@ public class CraftWorld implements World {
|
||||
return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
|
||||
}
|
||||
|
||||
+ // Paper start
|
||||
+ public boolean isChunkGenerated(int x, int z) {
|
||||
+ return this.getHandle().getChunkProviderServer().isChunkGenerated(x, z);
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
public ChunkGenerator getGenerator() {
|
||||
return generator;
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
|
@ -0,0 +1,22 @@
|
||||
From 33452d6bc4fe6ab71a2340e3d370af273de30a33 Mon Sep 17 00:00:00 2001
|
||||
From: Sotr <i@omc.hk>
|
||||
Date: Thu, 23 Aug 2018 16:14:12 +0800
|
||||
Subject: [PATCH] Add source block to BlockPhysicsEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 16d0c0d45..a4d9f0d5f 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -603,7 +603,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
||||
// CraftBukkit start
|
||||
CraftWorld world = ((WorldServer) this).getWorld();
|
||||
if (world != null && !((WorldServer)this).stopPhysicsEvent) { // Paper
|
||||
- BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
|
||||
+ BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata), blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()); // Paper - add source block
|
||||
this.getServer().getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
--
|
||||
2.18.0
|
||||
|
@ -34,9 +34,10 @@ fi
|
||||
# set a symlink to current
|
||||
currentlink="$workdir/Minecraft/current"
|
||||
if ([ ! -e "$currentlink" ] || [ -L "$currentlink" ]) && [ "$windows" == "false" ]; then
|
||||
set +e
|
||||
echo "Pointing $currentlink to $minecraftversion"
|
||||
rm -rf "$currentlink"
|
||||
ln -sfn "$minecraftversion" "$currentlink"
|
||||
rm -rf "$currentlink" || true
|
||||
ln -sfn "$minecraftversion" "$currentlink" || echo "Failed to set current symlink"
|
||||
fi
|
||||
|
||||
)
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren