mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-09 08:32:07 -07:00
694
This commit is contained in:
@@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ // Paper end - Configurable sculk sensor listener range
|
+ // Paper end - Configurable sculk sensor listener range
|
||||||
|
|
||||||
protected class VibrationUser extends SculkSensorBlockEntity.VibrationUser {
|
protected class VibrationUser extends SculkSensorBlockEntity.VibrationUser {
|
||||||
public VibrationUser(BlockPos pos) {
|
public VibrationUser(final BlockPos pos) {
|
||||||
@@ -0,0 +0,0 @@ public class CalibratedSculkSensorBlockEntity extends SculkSensorBlockEntity {
|
@@ -0,0 +0,0 @@ public class CalibratedSculkSensorBlockEntity extends SculkSensorBlockEntity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -58,8 +58,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
|
|
||||||
+ protected static final String PAPER_LISTENER_RANGE_NBT_KEY = "Paper.ListenerRange"; // Paper - Configurable sculk sensor listener range
|
+ protected static final String PAPER_LISTENER_RANGE_NBT_KEY = "Paper.ListenerRange"; // Paper - Configurable sculk sensor listener range
|
||||||
@Override
|
@Override
|
||||||
protected void saveAdditional(CompoundTag nbt) {
|
protected void saveAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) {
|
||||||
super.saveAdditional(nbt);
|
super.saveAdditional(nbt, registryLookup);
|
||||||
@@ -0,0 +0,0 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
|
@@ -0,0 +0,0 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList
|
||||||
.encodeStart(NbtOps.INSTANCE, this.vibrationData)
|
.encodeStart(NbtOps.INSTANCE, this.vibrationData)
|
||||||
.resultOrPartial(LOGGER::error)
|
.resultOrPartial(LOGGER::error)
|
||||||
@@ -87,8 +87,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSculkSensor.java
|
||||||
@@ -0,0 +0,0 @@ public class CraftSculkSensor<T extends SculkSensorBlockEntity> extends CraftBlo
|
@@ -0,0 +0,0 @@ public class CraftSculkSensor<T extends SculkSensorBlockEntity> extends CraftBlo
|
||||||
public CraftSculkSensor<T> copy() {
|
public CraftSculkSensor<T> copy(Location location) {
|
||||||
return new CraftSculkSensor<>(this);
|
return new CraftSculkSensor<>(this, location);
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ // Paper start
|
+ // Paper start
|
@@ -11,7 +11,7 @@ diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/ja
|
|||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||||
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||||
@@ -0,0 +0,0 @@ public final class ItemStack {
|
@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
|
||||||
int oldCount = this.getCount();
|
int oldCount = this.getCount();
|
||||||
ServerLevel world = (ServerLevel) context.getLevel();
|
ServerLevel world = (ServerLevel) context.getLevel();
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
world.captureBlockStates = true;
|
world.captureBlockStates = true;
|
||||||
// special case bonemeal
|
// special case bonemeal
|
||||||
if (item == Items.BONE_MEAL) {
|
if (item == Items.BONE_MEAL) {
|
||||||
@@ -0,0 +0,0 @@ public final class ItemStack {
|
@@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
|
||||||
world.capturedBlockStates.clear();
|
world.capturedBlockStates.clear();
|
||||||
if (blocks.size() > 1) {
|
if (blocks.size() > 1) {
|
||||||
placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockMultiPlaceEvent(world, entityhuman, enumhand, blocks, blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockMultiPlaceEvent(world, entityhuman, enumhand, blocks, blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
this.commandStorage = new CommandStorage(worldpersistentdata);
|
this.commandStorage = new CommandStorage(worldpersistentdata);
|
||||||
} else {
|
} else {
|
||||||
ChunkProgressListener worldloadlistener = this.progressListenerFactory.create(11);
|
ChunkProgressListener worldloadlistener = this.progressListenerFactory.create(this.worldData.getGameRules().getInt(GameRules.RULE_SPAWN_CHUNK_RADIUS));
|
||||||
- world = new ServerLevel(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, ImmutableList.of(), true, this.overworld().getRandomSequences(), org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
|
- world = new ServerLevel(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, ImmutableList.of(), true, this.overworld().getRandomSequences(), org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
|
||||||
+ // Paper start - option to use the dimension_type to check if spawners should be added. I imagine mojang will add some datapack-y way of managing this in the future.
|
+ // Paper start - option to use the dimension_type to check if spawners should be added. I imagine mojang will add some datapack-y way of managing this in the future.
|
||||||
+ final List<CustomSpawner> spawners;
|
+ final List<CustomSpawner> spawners;
|
Reference in New Issue
Block a user