Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated xseries to fully support 1.20 versions. #266

Open
wants to merge 3 commits into
base: 1.6.x
Choose a base branch
from
Open

Updated xseries to fully support 1.20 versions. #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3789d9
Updated xseries to fully support 1.20 versions.
RedW0lfStoneYT Jan 5, 2024
02276bd
Updated NBT Api to use the API not the plugin and updated the version
RedW0lfStoneYT Jan 5, 2024
43df7c9
Fixed issue with f chest saying "(!) That item no longer exists!" whe…
RedW0lfStoneYT Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<shadedPattern>com.massivecraft.factions.shade.com.darkblade12</shadedPattern>
</relocation>
<relocation>
<pattern>de.tr7zw</pattern>
<pattern>de.tr7zw.changeme.nbtapi</pattern>
<shadedPattern>com.massivecraft.factions.shade.nbtapi</shadedPattern>
</relocation>
</relocations>
Expand Down Expand Up @@ -115,8 +115,8 @@
</dependency>
<dependency>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-api-plugin</artifactId>
<version>2.11.3</version>
<artifactId>item-nbt-api</artifactId>
<version>2.12.2</version>
<scope>compile</scope>
</dependency>

Expand All @@ -136,7 +136,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>9.4.0</version>
<version>9.8.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -250,7 +250,7 @@
<dependency>
<groupId>net.ess3</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.16.0</version>
<version>2.18.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -419,11 +419,6 @@
<id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
<layout>default</layout>
</repository>
<repository>
<id>central</id>
<name>bintray</name>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/massivecraft/factions/cmd/audit/FChestListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public void onPlayerClickInventory(InventoryClickEvent event) {

if (event.getView().getTitle().equalsIgnoreCase(CC.translate(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title"))) && !event.getClick().isShiftClick()) {
if (currentItemType != Material.AIR) {
if (factionChestInventory == null || !factionChestInventory.contains(currentItem)) {
if ((factionChestInventory == null || !factionChestInventory.contains(currentItem)) && clickedInventory == factionChestInventory) {
event.setCancelled(true);
player.sendMessage(CC.RedB + "(!) That item no longer exists!");
Bukkit.getLogger().info("[FactionChest] " + player.getName() + " tried to remove " + currentItem + " from /f chest when it didn't contain! Items: " + (factionChestInventory == null ? "none" : Arrays.toString(factionChestInventory.getContents())));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/massivecraft/factions/cmd/banner/CmdBanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.CC;
import com.massivecraft.factions.zcore.util.TL;
import de.tr7zw.nbtapi.NBTItem;
import de.tr7zw.changeme.nbtapi.NBTItem;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/massivecraft/factions/cmd/banner/listener/BannerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.util.CC;
import com.massivecraft.factions.zcore.util.TL;
import de.tr7zw.nbtapi.NBTItem;
import de.tr7zw.changeme.nbtapi.NBTItem;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
Expand Down