Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2025-02-16 12:21:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/portals-old' into portals-old

Browse Source
This commit is contained in:
Sekwah 2018-05-30 12:33:03 +01:00
commit c23d7a2d14
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/plugin.yml
View File

@ -1,6 +1,6 @@
main: com.sekwah.advancedportals.AdvancedPortalsPlugin main: com.sekwah.advancedportals.AdvancedPortalsPlugin
name: AdvancedPortals name: AdvancedPortals
version: 0.0.39 version: 0.0.40
author: sekwah41 author: sekwah41
description: An advanced portals plugin for bukkit. description: An advanced portals plugin for bukkit.
commands: commands:

2
pom.xml
View File

@ -16,7 +16,7 @@
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository> </repository>
</repositories> </repositories>
<version>0.0.39-snapshot</version> <version>0.0.40-snapshot</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>

4
src/com/sekwah/advancedportals/portals/Portal.java
View File

@ -179,10 +179,10 @@ public class Portal {
Location checkpos1 = new Location(pos1.getWorld(), HighX, HighY, HighZ); Location checkpos1 = new Location(pos1.getWorld(), HighX, HighY, HighZ);
Location checkpos2 = new Location(pos2.getWorld(), LowX, LowY, LowZ); Location checkpos2 = new Location(pos2.getWorld(), LowX, LowY, LowZ);
if (checkPortalOverlap(checkpos1, checkpos2)) { /*if (checkPortalOverlap(checkpos1, checkpos2)) {
plugin.getLogger().log(Level.WARNING, "portals must not overlap!"); plugin.getLogger().log(Level.WARNING, "portals must not overlap!");
return "\u00A7cPortal creation error, portals must not overlap!"; return "\u00A7cPortal creation error, portals must not overlap!";
} }*/
portalData.getConfig().set(name + ".world", pos1.getWorld().getName()); portalData.getConfig().set(name + ".world", pos1.getWorld().getName());