spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore Spigot experience merging

Browse source
This commit is contained in:
md_5 2021-06-11 17:08:01 +10:00
parent c9cea60004
commit a09c0bb6c7
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
2 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
View file

@ -1,28 +1,12 @@
From accffd8b9c52629594bbedafe3e2308596005920 Mon Sep 17 00:00:00 2001
From 38dbcc226bbabe2e7d089dfaef18eed2e9121bb7 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/EntityExperienceOrb.java b/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
index a4248a168..b16ff216e 100644
--- a/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/world/entity/EntityExperienceOrb.java
@@ -167,7 +167,10 @@ public class EntityExperienceOrb extends Entity {
}
private static boolean b(WorldServer worldserver, Vec3D vec3d, int i) {
- AxisAlignedBB axisalignedbb = AxisAlignedBB.a(vec3d, 1.0D, 1.0D, 1.0D);
+ // Spigot start
+ double radius = worldserver.spigotConfig.expMerge;
+ AxisAlignedBB axisalignedbb = AxisAlignedBB.a(vec3d, radius, radius, radius);
+ // Spigot end
int j = worldserver.getRandom().nextInt(40);
List<EntityExperienceOrb> list = worldserver.a(EntityTypeTest.a(EntityExperienceOrb.class), axisalignedbb, (entityexperienceorb) -> {
return a(entityexperienceorb, j, i);
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 ff3cf5bee..bb9f81eeb 100644
index ff3cf5be..bb9f81ee 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -200,7 +200,10 @@ public class EntityItem extends Entity {
@ -46,8 +30,36 @@ index ff3cf5bee..bb9f81eeb 100644
a(this, itemstack, entityitem, itemstack1);
} else {
a(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 4e54c05d..99b588e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -596,6 +596,23 @@ public class CraftEventFactory {
} else if (entity.getBukkitEntity() instanceof org.bukkit.entity.LightningStrike) {
LightningStrikeEvent.Cause cause = (spawnReason == SpawnReason.COMMAND ? LightningStrikeEvent.Cause.COMMAND : LightningStrikeEvent.Cause.UNKNOWN);
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().grow(radius, radius, radius));
+ for (Entity e : entities) {
+ if (e instanceof EntityExperienceOrb) {
+ EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
+ if (!loopItem.isRemoved()) {
+ xp.value += loopItem.value;
+ loopItem.die();
+ }
+ }
+ }
+ }
+ // 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
index fb9c4fc7..8c855cf9 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -128,4 +128,18 @@ public class SpigotWorldConfig

8
CraftBukkit-Patches/0088-Implement-SpawnerSpawnEvent.patch
View file

@ -1,11 +1,11 @@
From b19e56bb3abe767391d6cfb38a54582553f8b851 Mon Sep 17 00:00:00 2001
From 5f12f952facad2f505f45e0d14d966481e931131 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 19:45:46 +1100
Subject: [PATCH] Implement SpawnerSpawnEvent.
diff --git a/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java b/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
index 0b744b2d7..e330ff646 100644
index 0b744b2d..e330ff64 100644
--- a/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
@@ -162,6 +162,18 @@ public abstract class MobSpawnerAbstract {
@ -28,7 +28,7 @@ index 0b744b2d7..e330ff646 100644
if (!worldserver.addAllEntitiesSafely(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit
this.d(worldserver, blockposition);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 4e54c05d8..5f0a70ed8 100644
index 99b588e1..c76759a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -225,6 +225,8 @@ import org.bukkit.inventory.InventoryView;
@ -40,7 +40,7 @@ index 4e54c05d8..5f0a70ed8 100644
public class CraftEventFactory {
public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.ON_FIRE);
public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC);
@@ -1417,6 +1419,21 @@ public class CraftEventFactory {
@@ -1434,6 +1436,21 @@ public class CraftEventFactory {
return event;
}