mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
b8fb7ff5b5
Upstream has released updates that appears to apply and compile correctly Paper Changes: 821ce25d9 Significantly improve performance of the end generation 2b2e4fd65 Add Wandering Trader spawn rate config options 7263cbca7 [CI-SKIP] [Auto] Rebuild Patches 1c63aff6d Villager resetOffers API 8d8d74a5f Patch 2 references an invalid variable e6d7bdca1 [CI-SKIP] fixed sed -i for bsd sed (#4782) 7ae47d4eb [CI-SKIP] Remove Waving banner fix (#4786)
74 lines
3.7 KiB
Diff
74 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: jmp <jasonpenilla2@me.com>
|
|
Date: Thu, 27 Aug 2020 13:48:52 -0700
|
|
Subject: [PATCH] Raid cooldown setting
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PersistentRaid.java b/src/main/java/net/minecraft/server/PersistentRaid.java
|
|
index 826dcf9f7..807910c60 100644
|
|
--- a/src/main/java/net/minecraft/server/PersistentRaid.java
|
|
+++ b/src/main/java/net/minecraft/server/PersistentRaid.java
|
|
@@ -9,6 +9,7 @@ import javax.annotation.Nullable;
|
|
|
|
public class PersistentRaid extends PersistentBase {
|
|
|
|
+ public final Map<java.util.UUID, Integer> playerCooldowns = new java.util.HashMap<>(); // Purpur
|
|
public final Map<Integer, Raid> raids = Maps.newHashMap();
|
|
private final WorldServer b;
|
|
private int c;
|
|
@@ -27,6 +28,17 @@ public class PersistentRaid extends PersistentBase {
|
|
|
|
public void a() {
|
|
++this.d;
|
|
+ // Purpur start
|
|
+ if (b.purpurConfig.raidCooldownSeconds != 0 && this.d % 20 == 0) {
|
|
+ com.google.common.collect.ImmutableMap.copyOf(playerCooldowns).forEach((id, i) -> {
|
|
+ if (i < 1) {
|
|
+ playerCooldowns.remove(id);
|
|
+ } else {
|
|
+ playerCooldowns.put(id, i - 1);
|
|
+ }
|
|
+ });
|
|
+ }
|
|
+ // Purpur end
|
|
Iterator iterator = this.raids.values().iterator();
|
|
|
|
while (iterator.hasNext()) {
|
|
@@ -110,10 +122,15 @@ public class PersistentRaid extends PersistentBase {
|
|
|
|
if (flag) {
|
|
// CraftBukkit start
|
|
- if (!org.bukkit.craftbukkit.event.CraftEventFactory.callRaidTriggerEvent(raid, entityplayer)) {
|
|
+ if ((b.purpurConfig.raidCooldownSeconds != 0 && playerCooldowns.containsKey(entityplayer.getUniqueID())) || !org.bukkit.craftbukkit.event.CraftEventFactory.callRaidTriggerEvent(raid, entityplayer)) { // Purpur
|
|
entityplayer.removeEffect(MobEffects.BAD_OMEN);
|
|
return null;
|
|
}
|
|
+ // Purpur start
|
|
+ if (b.purpurConfig.raidCooldownSeconds != 0) {
|
|
+ playerCooldowns.put(entityplayer.getUniqueID(), b.purpurConfig.raidCooldownSeconds);
|
|
+ }
|
|
+ // Purpur end
|
|
|
|
if (!this.raids.containsKey(raid.getId())) {
|
|
this.raids.put(raid.getId(), raid);
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index 3c91ab0a5..5386affba 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -157,6 +157,7 @@ public class PurpurWorldConfig {
|
|
public boolean saveProjectilesToDisk = true;
|
|
public double tridentLoyaltyVoidReturnHeight = 0.0D;
|
|
public double voidDamageHeight = -64.0D;
|
|
+ public int raidCooldownSeconds = 0;
|
|
private void miscGameplayMechanicsSettings() {
|
|
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
|
|
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
|
|
@@ -168,6 +169,7 @@ public class PurpurWorldConfig {
|
|
saveProjectilesToDisk = getBoolean("gameplay-mechanics.save-projectiles-to-disk", saveProjectilesToDisk);
|
|
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
|
|
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
|
|
+ raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);
|
|
}
|
|
|
|
public boolean catSpawning;
|