mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
86 lines
4.2 KiB
Diff
86 lines
4.2 KiB
Diff
From 32efb579e202fcb2b1f08319065080e1a3121a3f Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Sat, 23 Mar 2013 09:46:33 +1100
|
|
Subject: [PATCH] Merge tweaks and configuration
|
|
|
|
This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
|
|
index 5a0f63036..70c74e9c4 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
|
|
@@ -207,7 +207,10 @@ public class EntityItem extends Entity {
|
|
|
|
private void mergeWithNeighbours() {
|
|
if (this.isMergable()) {
|
|
- List<EntityItem> list = this.level.getEntitiesOfClass(EntityItem.class, this.getBoundingBox().inflate(0.5D, 0.0D, 0.5D), (entityitem) -> {
|
|
+ // Spigot start
|
|
+ double radius = level.spigotConfig.itemMerge;
|
|
+ List<EntityItem> list = this.level.getEntitiesOfClass(EntityItem.class, this.getBoundingBox().inflate(radius, radius - 0.5D, radius), (entityitem) -> {
|
|
+ // Spigot end
|
|
return entityitem != this && entityitem.isMergable();
|
|
});
|
|
Iterator iterator = list.iterator();
|
|
@@ -237,7 +240,7 @@ public class EntityItem extends Entity {
|
|
ItemStack itemstack1 = entityitem.getItem();
|
|
|
|
if (Objects.equals(this.getOwner(), entityitem.getOwner()) && areMergable(itemstack, itemstack1)) {
|
|
- if (itemstack1.getCount() < itemstack.getCount()) {
|
|
+ if (true || itemstack1.getCount() < itemstack.getCount()) { // Spigot
|
|
merge(this, itemstack, entityitem, itemstack1);
|
|
} else {
|
|
merge(entityitem, itemstack1, this, itemstack);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 247efa216..87a876b2d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -626,6 +626,23 @@ public class CraftEventFactory {
|
|
return true;
|
|
}
|
|
event = CraftEventFactory.callLightningStrikeEvent((LightningStrike) entity.getBukkitEntity(), cause);
|
|
+ // Spigot start
|
|
+ } else if (entity instanceof EntityExperienceOrb) {
|
|
+ EntityExperienceOrb xp = (EntityExperienceOrb) entity;
|
|
+ double radius = world.spigotConfig.expMerge;
|
|
+ if (radius > 0) {
|
|
+ List<Entity> entities = world.getEntities(entity, entity.getBoundingBox().inflate(radius, radius, radius));
|
|
+ for (Entity e : entities) {
|
|
+ if (e instanceof EntityExperienceOrb) {
|
|
+ EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
|
|
+ if (!loopItem.isRemoved()) {
|
|
+ xp.value += loopItem.value;
|
|
+ loopItem.discard();
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // Spigot end
|
|
} else if (!(entity instanceof EntityPlayer)) {
|
|
event = CraftEventFactory.callEntitySpawnEvent(entity);
|
|
}
|
|
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
index fb9c4fc78..8c855cf9b 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
@@ -128,4 +128,18 @@ public class SpigotWorldConfig
|
|
sweetBerryModifier = getAndValidateGrowth( "SweetBerry" );
|
|
kelpModifier = getAndValidateGrowth( "Kelp" );
|
|
}
|
|
+
|
|
+ public double itemMerge;
|
|
+ private void itemMerge()
|
|
+ {
|
|
+ itemMerge = getDouble("merge-radius.item", 2.5 );
|
|
+ log( "Item Merge Radius: " + itemMerge );
|
|
+ }
|
|
+
|
|
+ public double expMerge;
|
|
+ private void expMerge()
|
|
+ {
|
|
+ expMerge = getDouble("merge-radius.exp", 3.0 );
|
|
+ log( "Experience Merge Radius: " + expMerge );
|
|
+ }
|
|
}
|
|
--
|
|
2.34.1
|
|
|