Skip to content

Commit 036a606

Browse files
committed
Merge branch 'upstream' into pull-upstream
2 parents 42cb78f + 57d9e33 commit 036a606

File tree

4 files changed

+42
-22
lines changed

4 files changed

+42
-22
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
- package-ecosystem: "maven"
8+
directory: "/"
9+
schedule:
10+
interval: "monthly"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Auto-merge Dependabot PRs
2+
3+
on:
4+
workflow_run:
5+
workflows: [ "Pull Request" ]
6+
types: [ completed ]
7+
8+
jobs:
9+
automerge-dependabot-pr:
10+
if: "github.actor == 'dependabot[bot]'
11+
&& github.event.workflow_run.event == 'pull_request'
12+
&& github.event.workflow_run.conclusion == 'success'"
13+
uses: Jikoo/PlanarActions/.github/workflows/pr_automerge_complete.yml@master
14+
with:
15+
triggering-workflow-run: ${{ github.event.workflow_run.id }}

.github/workflows/pull_request.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Pull Request
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
run-ci:
8+
uses: Jikoo/PlanarActions/.github/workflows/ci_maven.yml@master
9+
store-dependabot-pr-data:
10+
if: "github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'"
11+
uses: Jikoo/PlanarActions/.github/workflows/pr_automerge_prep.yml@master
12+
with:
13+
pr-number: ${{ github.event.number }}

src/main/java/com/github/jikoo/anvilunlocker/AnvilUnlocker.java

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
import com.comphenix.protocol.PacketType;
44
import com.comphenix.protocol.ProtocolLibrary;
55
import com.comphenix.protocol.events.PacketContainer;
6-
import java.lang.reflect.InvocationTargetException;
76
import org.bukkit.GameMode;
87
import org.bukkit.Material;
98
import org.bukkit.entity.Player;
109
import org.bukkit.event.EventHandler;
1110
import org.bukkit.event.EventPriority;
1211
import org.bukkit.event.Listener;
1312
import org.bukkit.event.inventory.InventoryCloseEvent;
14-
import org.bukkit.event.inventory.InventoryOpenEvent;
1513
import org.bukkit.event.inventory.PrepareAnvilEvent;
1614
import org.bukkit.inventory.AnvilInventory;
1715
import org.bukkit.inventory.ItemStack;
@@ -37,20 +35,6 @@ public void reloadConfig() {
3735
maximumCost = constrainAnvilMax(getConfig().getInt("maximumCost"));
3836
}
3937

40-
@EventHandler(priority = EventPriority.MONITOR)
41-
private void onInventoryOpen(@NotNull InventoryOpenEvent event) {
42-
if (!(event.getInventory() instanceof AnvilInventory)) {
43-
return;
44-
}
45-
46-
((AnvilInventory) event.getInventory()).setMaximumRepairCost(maximumCost);
47-
48-
if (event.getPlayer() instanceof Player
49-
&& event.getPlayer().getGameMode() != GameMode.CREATIVE) {
50-
setInstantBuild((Player) event.getPlayer(), true);
51-
}
52-
}
53-
5438
@EventHandler(priority = EventPriority.MONITOR)
5539
private void onInventoryClose(@NotNull InventoryCloseEvent event) {
5640
if (event.getInventory() instanceof AnvilInventory
@@ -67,8 +51,10 @@ private void onPrepareAnvil(@NotNull PrepareAnvilEvent event) {
6751
return;
6852
}
6953

54+
AnvilInventory anvil = event.getInventory();
55+
anvil.setMaximumRepairCost(maximumCost);
56+
7057
getServer().getScheduler().runTask(this, () -> {
71-
AnvilInventory anvil = event.getInventory();
7258
ItemStack input2 = anvil.getItem(1);
7359
setInstantBuild(
7460
(Player) event.getView().getPlayer(),
@@ -88,11 +74,7 @@ public void setInstantBuild(@NotNull Player player, boolean instantBuild) {
8874
packet.getFloat().write(0, player.getFlySpeed() / 2);
8975
packet.getFloat().write(1, player.getWalkSpeed() / 2);
9076

91-
try {
92-
ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet);
93-
} catch (InvocationTargetException e) {
94-
e.printStackTrace();
95-
}
77+
ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet);
9678
}
9779

9880
private static int constrainAnvilMax(int actual) {

0 commit comments

Comments
 (0)