Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2024-11-28 13:35:28 +01:00
Code Issues Projects Releases Wiki Activity

Made fix for #127

Browse Source
This commit is contained in:
Sekwah 2018-08-30 01:53:17 +01:00
parent accfda8d90
commit 24d0f4719d
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -4,7 +4,7 @@ apply plugin: 'idea'
apply plugin: 'eclipse' apply plugin: 'eclipse'
group = 'com.sekwah.advancedportals' group = 'com.sekwah.advancedportals'
version = '0.0.47-snapshot' version = '0.0.48-snapshot'
description = "" description = ""

2
out/production/resources/config.yml
View File

@ -69,6 +69,8 @@ BlockSpectatorMode: false
PortalCooldown: 5 # How long after trying to enter a portal until the player can try to enter another. 0 or lower to deactivate. PortalCooldown: 5 # How long after trying to enter a portal until the player can try to enter another. 0 or lower to deactivate.
ThrowbackAmount: 0.7 # How fast to throw them back, 0 or lower to disable throwback ThrowbackAmount: 0.7 # How fast to throw them back, 0 or lower to disable throwback
DisableGatewayBeam: true
# Letters are flags. Include them to activate. n always disables everything, remove if you want it to work. # Letters are flags. Include them to activate. n always disables everything, remove if you want it to work.
# Lettering may not make too much sense but meh its useful. Examples are "ocpk" or "cop" (doesnt matter order) # Lettering may not make too much sense but meh its useful. Examples are "ocpk" or "cop" (doesnt matter order)
# #

2
out/production/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.46 version: 0.0.48
author: sekwah41 author: sekwah41
description: An advanced portals plugin for bukkit. description: An advanced portals plugin for bukkit.
api-version: 1.13 api-version: 1.13

5
src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java
View File

@ -86,6 +86,7 @@ public class CraftBukkit {
if(field.getType() == int.class && !field.isAccessible()) { if(field.getType() == int.class && !field.isAccessible()) {
field.setAccessible(true); field.setAccessible(true);
getEntityTimeoutField = field; getEntityTimeoutField = field;
this.plugin.getLogger().info("Got field " + field.getName() + " from TileEntityEndGateway");
return; return;
} }
} }
@ -143,11 +144,11 @@ public class CraftBukkit {
* @param block * @param block
*/ */
public void setGatewayAgeHigh(Block block) { public void setGatewayAgeHigh(Block block) {
if(block.getState().getClass().isAssignableFrom(this.endGatewayClass)) { if(this.endGatewayClass.isAssignableFrom(block.getState().getClass())) {
try { try {
Object tileEntity = this.getTileEntityMethod.invoke(this.getWorldHandleMethod.invoke(block.getWorld()), Object tileEntity = this.getTileEntityMethod.invoke(this.getWorldHandleMethod.invoke(block.getWorld()),
this.blockPositionConstructor.newInstance(block.getX(), block.getY(), block.getZ())); this.blockPositionConstructor.newInstance(block.getX(), block.getY(), block.getZ()));
if(tileEntity.getClass().isAssignableFrom(this.tileEntityEndGatewayClass)) { if(this.tileEntityEndGatewayClass.isAssignableFrom(tileEntity.getClass())) {
getEntityTimeoutField.set(tileEntity, Integer.MAX_VALUE); getEntityTimeoutField.set(tileEntity, Integer.MAX_VALUE);
} }
} catch (IllegalAccessException| InvocationTargetException | InstantiationException e) { } catch (IllegalAccessException| InvocationTargetException | InstantiationException e) {

2
src/main/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.47 version: 0.0.48
author: sekwah41 author: sekwah41
description: An advanced portals plugin for bukkit. description: An advanced portals plugin for bukkit.
api-version: 1.13 api-version: 1.13